From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Andrzej Siewior Subject: [PATCH 1/6] i2c/pxa2xx: Don't touch ISAR on X86 Date: Thu, 2 Dec 2010 21:09:44 +0100 Message-ID: <1291320589-31570-2-git-send-email-bigeasy@linutronix.de> References: <1291320589-31570-1-git-send-email-bigeasy@linutronix.de> Return-path: In-Reply-To: <1291320589-31570-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, sodaville-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org, ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Sebastian Andrzej Siewior , ben-i2c-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, Dirk Brandewie List-Id: linux-i2c@vger.kernel.org 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-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie --- 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