i2c: imx: Fix reset of I2SR_IAL flag
Subsystems (4)
PATCH 1/1 i2c: imx: Fix reset of I2SR_IAL flag
commit 384a9565f70a876c2e78e58c5ca0bbf0547e4f6d upstream.
According to the "VFxxx Controller Reference Manual" (and the comment block starting at line 97), Vybrid requires writing a one for clearing an interrupt flag. Syncing the method for clearing I2SR_IIF in i2c_imx_isr().
---
Hi Greg,
here is the patch for linux-5.4. Please let me know if this doesn't apply to older kernels.
regards
Christian
Quoted 6 lines · On Wednesday, 9 December 2020, 09:31:33 CET, [email protected] wrote:
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Quoted 7 lines
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From
384a9565f70a876c2e78e58c5ca0bbf0547e4f6dMon Sep 17 00:00:00 2001
drivers/i2c/busses/i2c-imx.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-imx.c +15 -5
@@ -414,6 +414,19 @@ static void i2c_imx_dma_free(struct imx_i2c_struct *i2c_imx) dma->chan_using =NULL ; } +static void i2c_imx_clear_irq (struct imx_i2c_struct *i2c_imx,unsigned int bits) +{ +unsigned int temp; + +/* +* i2sr_clr_opcode is the value to clear all interrupts. Here we want to +* clear only <bits>, so we write ~i2sr_clr_opcode with just <bits> +* toggled. This is required because i.MX needs W0C and Vybrid uses W1C. +*/ + temp = ~i2c_imx->hwdata->i2sr_clr_opcode ^ bits; +imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2SR ); +} +static int i2c_imx_bus_busy (struct imx_i2c_struct *i2c_imx,int for_busy) {unsigned long orig_jiffies = jiffies;
@@ -426,8 +439,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)/* check for arbitration lost */ if (temp &I2SR_IAL ) { - temp &= ~I2SR_IAL ; -imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2SR ); +i2c_imx_clear_irq (i2c_imx,I2SR_IAL );return -EAGAIN ; }
@@ -599,9 +611,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)if (temp &I2SR_IIF ) {/* save status register */ i2c_imx->i2csr = temp; - temp &= ~I2SR_IIF ; - temp |= (i2c_imx->hwdata->i2sr_clr_opcode &I2SR_IIF ); -imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2SR ); +i2c_imx_clear_irq (i2c_imx,I2SR_IIF );wake_up (&i2c_imx->queue);return IRQ_HANDLED ; }
Signature · 8 lines
Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
Greg KH
maintainerQuoted 12 lines · Christian Eggers
commit
384a9565f70a876c2e78e58c5ca0bbf0547e4f6dupstream.According to the "VFxxx Controller Reference Manual" (and the comment block starting at line 97), Vybrid requires writing a one for clearing an interrupt flag. Syncing the method for clearing
I2SR_IIFini2c_imx_isr().Signed-off-by Christian Eggers <[email protected]>Fixes 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")Reviewed-by Uwe Kleine-König <[email protected]>Acked-by Oleksij Rempel <[email protected]>
Quoted 5 lines
---
Hi Greg,here is the patch for linux-5.4. Please let me know if this doesn't apply to older kernels.
That worked great, thanks!
greg k-h