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

Commit c3be0af1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: rcar: check master irqs before slave irqs 



Due to the HW design, master IRQs are timing critical, so give them
precedence over slave IRQ.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent d89667b1

drivers/i2c/busses/i2c-rcar.c

+5 −8
Original line number Diff line number Diff line
@@ -432,19 +432,17 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv) 
static irqreturn_t rcar_i2c_irq(int irq, void *ptr)

{

	struct rcar_i2c_priv *priv = ptr;

	irqreturn_t result = IRQ_HANDLED;

	u32 msr;



	if (rcar_i2c_slave_irq(priv))

		goto exit;



	msr = rcar_i2c_read(priv, ICMSR);



	/* Only handle interrupts that are currently enabled */

	msr &= rcar_i2c_read(priv, ICMIER);

	if (!msr) {

		result = IRQ_NONE;

		goto exit;

		if (rcar_i2c_slave_irq(priv))

			return IRQ_HANDLED;



		return IRQ_NONE;

	}



	/* Arbitration lost */
@@ -481,8 +479,7 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) 
		wake_up(&priv->wait);

	}



exit:

	return result;

	return IRQ_HANDLED;

}



static int rcar_i2c_master_xfer(struct i2c_adapter *adap,