On Thu, Dec 02, 2010 at 09:09:44PM +0100, Sebastian Andrzej Siewior wrote: > The reset functions sets writes the slave address even in not slave > mode. I don't see any reason in writting it if slave mode is not > enabled. > Ben Dooks was conserned about making this change make it unavable on X86 > where it is not available. > > Cc: ben-i2c@xxxxxxxxx > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> > Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx> > --- > drivers/i2c/busses/i2c-pxa.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c > index f4c19a9..aadf9d2 100644 > --- a/drivers/i2c/busses/i2c-pxa.c > +++ b/drivers/i2c/busses/i2c-pxa.c > @@ -418,7 +418,9 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c) > writel(I2C_ISR_INIT, _ISR(i2c)); > writel(readl(_ICR(i2c)) & ~ICR_UR, _ICR(i2c)); > > +#ifndef CONFIG_X86 > writel(i2c->slave_addr, _ISAR(i2c)); > +#endif I'd prefer some way of changing based on either the device name (see some other drivers which bind on multiple names) to define things such as this, as well as possibly changing the register layout. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html