Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d7afc95 authored by Felipe Balbi's avatar Felipe Balbi Committed by Wolfram Sang
Browse files

i2c: omap: ack IRQ in parts 



According to flow diagrams on OMAP TRMs,
we should ACK the IRQ as they happen.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
[Ack the stat OMAP_I2C_STAT_AL in case of arbitration lost]
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 66b92988

drivers/i2c/busses/i2c-omap.c

+16 −12
Original line number Diff line number Diff line
@@ -850,21 +850,19 @@ omap_i2c_isr(int this_irq, void *dev_id) 
		}



complete:

		/*

		 * Ack the stat in one go, but [R/X]DR and [R/X]RDY should be

		 * acked after the data operation is complete.

		 * Ref: TRM SWPU114Q Figure 18-31

		 */

		omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, stat &

				~(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |

				OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));



		if (stat & OMAP_I2C_STAT_NACK)

		if (stat & OMAP_I2C_STAT_NACK) {

			err |= OMAP_I2C_STAT_NACK;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

		}



		if (stat & OMAP_I2C_STAT_AL) {

			dev_err(dev->dev, "Arbitration lost\n");

			err |= OMAP_I2C_STAT_AL;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

		}



		/*
@@ -941,12 +939,18 @@ complete: 


		if (stat & OMAP_I2C_STAT_ROVR) {

			dev_err(dev->dev, "Receive overrun\n");

			dev->cmd_err |= OMAP_I2C_STAT_ROVR;

			err |= OMAP_I2C_STAT_ROVR;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

		}



		if (stat & OMAP_I2C_STAT_XUDF) {

			dev_err(dev->dev, "Transmit underflow\n");

			dev->cmd_err |= OMAP_I2C_STAT_XUDF;

			err |= OMAP_I2C_STAT_XUDF;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

		}

	} while (stat);