aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2012-09-12 06:58:06 -0400
committerWolfram Sang <w.sang@pengutronix.de>2012-09-12 09:03:05 -0400
commit079d8af24b948261e1dae5d7df6b31b7bf205cb4 (patch)
tree9bb045ecb6e9812917cb92bcc78ddad01d09b4bb /drivers/i2c
parentac79e4b24972c69debef90a5e16b145e59222388 (diff)
i2c: omap: bus: add a receiver flag
that way we can ignore TX IRQs while in receiver mode and ignore RX IRQs while in transmitter mode. Signed-off-by: Felipe Balbi <balbi@ti.com> [Remove unnecessary braces] Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 0da8169ca5b..3be147ab4eb 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -199,6 +199,7 @@ struct omap_i2c_dev {
199 */ 199 */
200 u8 rev; 200 u8 rev;
201 unsigned b_hw:1; /* bad h/w fixes */ 201 unsigned b_hw:1; /* bad h/w fixes */
202 unsigned receiver:1; /* true when we're in receiver mode */
202 u16 iestate; /* Saved interrupt register */ 203 u16 iestate; /* Saved interrupt register */
203 u16 pscstate; 204 u16 pscstate;
204 u16 scllstate; 205 u16 scllstate;
@@ -492,6 +493,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
492 493
493 INIT_COMPLETION(dev->cmd_complete); 494 INIT_COMPLETION(dev->cmd_complete);
494 dev->cmd_err = 0; 495 dev->cmd_err = 0;
496 dev->receiver = !!(msg->flags & I2C_M_RD);
495 497
496 w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT; 498 w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT;
497 499
@@ -837,6 +839,12 @@ omap_i2c_isr(int this_irq, void *dev_id)
837 stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); 839 stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
838 stat &= bits; 840 stat &= bits;
839 841
842 /* If we're in receiver mode, ignore XDR/XRDY */
843 if (dev->receiver)
844 stat &= ~(OMAP_I2C_STAT_XDR | OMAP_I2C_STAT_XRDY);
845 else
846 stat &= ~(OMAP_I2C_STAT_RDR | OMAP_I2C_STAT_RRDY);
847
840 if (!stat) { 848 if (!stat) {
841 /* my work here is done */ 849 /* my work here is done */
842 return IRQ_HANDLED; 850 return IRQ_HANDLED;