i2c-designware: Enable RX_FULL interrupt
authorShinya Kuribayashi <shinya.kuribayashi@necel.com>
Fri, 6 Nov 2009 12:48:33 +0000 (21:48 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 9 Dec 2009 00:19:11 +0000 (00:19 +0000)
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>
drivers/i2c/busses/i2c-designware.c

index 0eea0dd35895808a989456c017931b69d28e06bc..940bbf31bc8c10c4127bf732d85be37cf8c8f473 100644 (file)
@@ -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.