Commit 540a4790 authored by Felipe Balbi's avatar Felipe Balbi Committed by Wolfram Sang

i2c: omap: simplify omap_i2c_ack_stat()

stat & BIT(1) is the same as BIT(1), so let's
simplify things a bit by removing "stat &" from
all omap_i2c_ack_stat() calls.

Code snippet (extremely simplified):

if (stat & NACK) {
        ...
        omap_i2c_ack_stat(dev, stat & NACK);
}

if (stat & RDR) {
        ...
        omap_i2c_ack_stat(dev, stat & RDR);
}

and so on. The tricky place is only WRT errata handling, for example:

if (*stat & (NACK | AL)) {
        omap_i2c_ack_stat(dev, *stat & (XRDY | XDR));
        ...
}

but in this case, the errata says we must clear XRDY and XDR if that
errata triggers, so if they just got enabled or not, it doesn't matter.

Another tricky place is RDR | RRDY (likewise for XDR | XRDY):

if (stat & (RDR | RRDY)) {
        ...
        omap_i2c_ack_stat(dev, stat & (RDR | RRDY));
}

again here there will be no issues because those IRQs never fire
simultaneously and one will only after after we have handled the
previous, that's because the same FIFO is used anyway and we won't shift
data into FIFO until we tell the IP "hey, I'm done with the FIFO, you
can shift more data"
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Reviewed-by : Santosh Shilimkar <santosh.shilimkar@ti.com>
[Added the explaination from the discurssion to the commit logs]
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent c55edb99
...@@ -731,7 +731,7 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev, u16 *stat, int *err) ...@@ -731,7 +731,7 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev, u16 *stat, int *err)
while (--timeout && !(*stat & OMAP_I2C_STAT_XUDF)) { while (--timeout && !(*stat & OMAP_I2C_STAT_XUDF)) {
if (*stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { if (*stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) {
omap_i2c_ack_stat(dev, *stat & (OMAP_I2C_STAT_XRDY | omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY |
OMAP_I2C_STAT_XDR)); OMAP_I2C_STAT_XDR));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -792,9 +792,10 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -792,9 +792,10 @@ omap_i2c_isr(int this_irq, void *dev_id)
*/ */
if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
OMAP_I2C_STAT_AL)) { OMAP_I2C_STAT_AL)) {
omap_i2c_ack_stat(dev, stat & omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |
(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR | OMAP_I2C_STAT_RDR |
OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR | OMAP_I2C_STAT_XRDY |
OMAP_I2C_STAT_XDR |
OMAP_I2C_STAT_ARDY)); OMAP_I2C_STAT_ARDY));
omap_i2c_complete_cmd(dev, err); omap_i2c_complete_cmd(dev, err);
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -842,8 +843,8 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -842,8 +843,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
} }
} }
} }
omap_i2c_ack_stat(dev, omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |
stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)); OMAP_I2C_STAT_RDR));
continue; continue;
} }
...@@ -890,8 +891,8 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -890,8 +891,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
} }
omap_i2c_ack_stat(dev, omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY |
stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); OMAP_I2C_STAT_XDR));
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment