diff options
author | Shinya Kuribayashi <shinya.kuribayashi@necel.com> | 2009-11-06 21:48:33 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-09 00:19:11 +0000 |
commit | 21a89d4101ce338c2872401c82b66a7c155e24ab (patch) | |
tree | 6ca44511457f1b9bfb42f322cebc2a12dbc89c3d | |
parent | 4cb6d1d6da471d795320cc4a933ce60f415dd1f6 (diff) | |
download | linux-3.10-21a89d4101ce338c2872401c82b66a7c155e24ab.tar.gz linux-3.10-21a89d4101ce338c2872401c82b66a7c155e24ab.tar.bz2 linux-3.10-21a89d4101ce338c2872401c82b66a7c155e24ab.zip |
i2c-designware: Enable RX_FULL interrupt
Enable RX_FULL interrupt mask by default, and hook it in the interrupt
handler. If requested amount of rx data (defined by IC_RX_TL) is not
available, we don't have to process i2c_dw_read().
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | drivers/i2c/busses/i2c-designware.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index 0eea0dd3589..940bbf31bc8 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c @@ -342,7 +342,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) u32 addr = msgs[dev->msg_write_idx].addr; u32 buf_len = dev->tx_buf_len; - intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT; + intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT | DW_IC_INTR_RX_FULL; if (!(dev->status & STATUS_WRITE_IN_PROGRESS)) { /* Disable the adapter */ @@ -593,10 +593,11 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id) dev->status = STATUS_IDLE; } - if (stat & DW_IC_INTR_TX_EMPTY) { + if (stat & DW_IC_INTR_RX_FULL) i2c_dw_read(dev); + + if (stat & DW_IC_INTR_TX_EMPTY) i2c_dw_xfer_msg(dev); - } /* * No need to modify or disable the interrupt mask here. |