On Wed, Nov 24, 2010 at 10:20:11PM +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. > I have here a PXA-I2C variant where this register is not availbale and > as such can not be touched. > > 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..579c8a8 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)); > > +#ifdef CONFIG_I2C_PXA_SLAVE > writel(i2c->slave_addr, _ISAR(i2c)); > +#endif I was thinking about whether to add a flag to this to say whether the slave_addr field is valid, but to keep full compatiblity with the existing pxa users, we'd have to go and change every board using it. -- 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
