[PATCH 1/6] i2c/pxa2xx: Don't touch ISAR on X86
Sebastian Andrzej Siewior
bigeasy at linutronix.de
Thu Dec 2 15:09:44 EST 2010
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 at fluff.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
Signed-off-by: Dirk Brandewie <dirk.brandewie at gmail.com>
---
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
/* set control register values */
writel(I2C_ICR_INIT | (i2c->fast_mode ? ICR_FM : 0), _ICR(i2c));
--
1.7.3.2
More information about the linux-arm-kernel
mailing list