Hi Ben Dooks/Wolfram Sang, Would you please help to review and merge these 11 patches for drivers/i2c/busses/i2c-pxa.c? [PATCH 01/11] i2c: pxa: support hardware lock [PATCH 02/11] i2c: pxa: support pxa910 in id table [PATCH 03/11] i2c: pxa: add more error handling for i2c controller [PATCH 04/11] i2c: pxa: fix irq unbalanced warning [PATCH 05/11] i2c: pxa: add bus reset for platform data; [PATCH 06/11] i2c: pxa: Keep i2c clock enabled when system suspends/resumes. [PATCH 07/11] i2c: pxa: keep i2c irq on in suspend [PATCH 08/11] i2c: pxa: bugfix the slave addr in the transaction [PATCH 09/11] i2c: pxa: add qos as constraint for cpu-idle [PATCH 10/11] i2c: pxa: modify the parameters of i2c_bus_reset() [PATCH 11/11] i2c: pxa: no need slave addr for i2c master mode reset Thanks a lot. Best Wishes, Leo Song Tel: 6194-9745, Marvell (Shanghai) B3-F4-4D12, No. 399 of Keyuan Rd, Pudong District, Shanghai >-----Original Message----- >From: Leo Song [mailto:liangs@xxxxxxxxxxx] >Sent: 2012年11月8日 22:18 >To: Ben Dooks; Wolfram Sang >Cc: Leo Song; Chao Xie; linux-i2c@xxxxxxxxxxxxxxx; Jett Zhou >Subject: [PATCH 11/11] i2c: pxa: no need slave addr for i2c master mode >reset > >From: "Jett.Zhou" <jtzhou@xxxxxxxxxxx> > >Normally i2c controller works as master, slave addr is not needed, or it >will impact some slave device(eg. ST NFC chip) i2c access, because it >has >the same i2c address with controller. > >Change-Id: Iaf6e16cf2e211d242b21086e491b751ea311a000 >Signed-off-by: Jett.Zhou <jtzhou@xxxxxxxxxxx> > >diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c >index 3346fef..2dc3af3 100644 >--- a/drivers/i2c/busses/i2c-pxa.c >+++ b/drivers/i2c/busses/i2c-pxa.c >@@ -490,8 +490,10 @@ 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 > if (i2c->reg_isar) > 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.5.4 ?韬{.n?????%??檩??w?{.n???{炳-?)?骅w* jg????????G??⒏ ⒎?:+v???????? ????＂??????
