]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop i2c-imx-fix-reset-of-i2sr_ial-flag.patch from everywhere.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Oct 2020 12:45:25 +0000 (14:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Oct 2020 12:45:25 +0000 (14:45 +0200)
again.

12 files changed:
queue-4.14/i2c-imx-fix-reset-of-i2sr_ial-flag.patch [deleted file]
queue-4.14/series
queue-4.19/i2c-imx-fix-reset-of-i2sr_ial-flag.patch [deleted file]
queue-4.19/series
queue-4.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch [deleted file]
queue-4.4/series
queue-4.9/i2c-imx-fix-reset-of-i2sr_ial-flag.patch [deleted file]
queue-4.9/series
queue-5.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch [deleted file]
queue-5.4/series
queue-5.8/i2c-imx-fix-reset-of-i2sr_ial-flag.patch [deleted file]
queue-5.8/series

diff --git a/queue-4.14/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-4.14/i2c-imx-fix-reset-of-i2sr_ial-flag.patch
deleted file mode 100644 (file)
index 194abe7..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian Eggers <ceggers@arri.de>
-
-commit fa4d30556883f2eaab425b88ba9904865a4d00f3 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().
-
-Signed-off-by: Christian Eggers <ceggers@arri.de>
-Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-imx.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-imx.c
-+++ b/drivers/i2c/busses/i2c-imx.c
-@@ -412,6 +412,19 @@ static void i2c_imx_dma_free(struct 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 W1C and Vybrid uses W0C.
-+       */
-+      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;
-@@ -424,8 +437,7 @@ static int i2c_imx_bus_busy(struct imx_i
-               /* 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;
-               }
-@@ -583,9 +595,7 @@ static irqreturn_t i2c_imx_isr(int irq,
-       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;
-       }
index 34eb4b9045c5fe823503a9eb9c3ea8aafe00aa77..6d3b8c6dede22104d08b7d94b88173a5bbea16b7 100644 (file)
@@ -67,4 +67,3 @@ rxrpc-fix-server-keyring-leak.patch
 perf-fix-task_function_call-error-handling.patch
 mmc-core-don-t-set-limits.discard_granularity-as-0.patch
 mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
diff --git a/queue-4.19/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-4.19/i2c-imx-fix-reset-of-i2sr_ial-flag.patch
deleted file mode 100644 (file)
index 08becc8..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian Eggers <ceggers@arri.de>
-
-commit fa4d30556883f2eaab425b88ba9904865a4d00f3 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().
-
-Signed-off-by: Christian Eggers <ceggers@arri.de>
-Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-imx.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-imx.c
-+++ b/drivers/i2c/busses/i2c-imx.c
-@@ -404,6 +404,19 @@ static void i2c_imx_dma_free(struct 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 W1C and Vybrid uses W0C.
-+       */
-+      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;
-@@ -416,8 +429,7 @@ static int i2c_imx_bus_busy(struct imx_i
-               /* 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;
-               }
-@@ -587,9 +599,7 @@ static irqreturn_t i2c_imx_isr(int irq,
-       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;
-       }
index ac58fcbc430e69a2dd5d12e3aec537cc70471991..b8b4c37af973b0dc784f583c6ede99c12ba6b895 100644 (file)
@@ -46,4 +46,3 @@ rxrpc-fix-server-keyring-leak.patch
 perf-fix-task_function_call-error-handling.patch
 mmc-core-don-t-set-limits.discard_granularity-as-0.patch
 mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
diff --git a/queue-4.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-4.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch
deleted file mode 100644 (file)
index c7c0462..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian Eggers <ceggers@arri.de>
-
-commit fa4d30556883f2eaab425b88ba9904865a4d00f3 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().
-
-Signed-off-by: Christian Eggers <ceggers@arri.de>
-Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-imx.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-imx.c
-+++ b/drivers/i2c/busses/i2c-imx.c
-@@ -420,6 +420,19 @@ static void i2c_imx_dma_free(struct imx_
- /** Functions for IMX I2C adapter driver ***************************************
- *******************************************************************************/
-+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 W1C and Vybrid uses W0C.
-+       */
-+      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;
-@@ -432,8 +445,7 @@ static int i2c_imx_bus_busy(struct imx_i
-               /* 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;
-               }
-@@ -595,9 +607,7 @@ static irqreturn_t i2c_imx_isr(int irq,
-       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;
-       }
index b9bec582924cac7bb1316566521038d48b5c70d7..009d11f337eb35dd6ea6ea1cbd56592afacd7fcd 100644 (file)
@@ -36,4 +36,3 @@ bonding-set-dev-needed_headroom-in-bond_setup_by_sla.patch
 rxrpc-fix-rxkad-token-xdr-encoding.patch
 rxrpc-downgrade-the-bug-for-unsupported-token-type-i.patch
 rxrpc-fix-server-keyring-leak.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
diff --git a/queue-4.9/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-4.9/i2c-imx-fix-reset-of-i2sr_ial-flag.patch
deleted file mode 100644 (file)
index 194abe7..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian Eggers <ceggers@arri.de>
-
-commit fa4d30556883f2eaab425b88ba9904865a4d00f3 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().
-
-Signed-off-by: Christian Eggers <ceggers@arri.de>
-Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-imx.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-imx.c
-+++ b/drivers/i2c/busses/i2c-imx.c
-@@ -412,6 +412,19 @@ static void i2c_imx_dma_free(struct 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 W1C and Vybrid uses W0C.
-+       */
-+      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;
-@@ -424,8 +437,7 @@ static int i2c_imx_bus_busy(struct imx_i
-               /* 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;
-               }
-@@ -583,9 +595,7 @@ static irqreturn_t i2c_imx_isr(int irq,
-       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;
-       }
index 102d711faee27475f1baec34f33950a91253affe..509b3baf0e7214c21a5dcd524cf44fb3cd5a65b4 100644 (file)
@@ -51,4 +51,3 @@ rxrpc-fix-some-missing-_bh-annotations-on-locking-co.patch
 rxrpc-fix-server-keyring-leak.patch
 perf-fix-task_function_call-error-handling.patch
 mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
diff --git a/queue-5.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-5.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch
deleted file mode 100644 (file)
index 3739700..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian Eggers <ceggers@arri.de>
-
-commit fa4d30556883f2eaab425b88ba9904865a4d00f3 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().
-
-Signed-off-by: Christian Eggers <ceggers@arri.de>
-Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-imx.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-imx.c
-+++ b/drivers/i2c/busses/i2c-imx.c
-@@ -414,6 +414,19 @@ static void i2c_imx_dma_free(struct 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 W1C and Vybrid uses W0C.
-+       */
-+      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_i
-               /* 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;
-               }
-@@ -597,9 +609,7 @@ static irqreturn_t i2c_imx_isr(int irq,
-       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;
-       }
index 64afec35169b5080324f91e233fa7b8a21e619f4..37c072c50bcec17fbcda85fad2f697a74ad0fa48 100644 (file)
@@ -77,6 +77,5 @@ mmc-core-don-t-set-limits.discard_granularity-as-0.patch
 mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch
 tcp-fix-receive-window-update-in-tcp_add_backlog.patch
 net-core-check-length-before-updating-ethertype-in-skb_mpls_-push-pop.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 net-tls-race-causes-kernel-panic.patch
 net-mlx5e-fix-driver-s-declaration-to-support-gre-offload.patch
diff --git a/queue-5.8/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-5.8/i2c-imx-fix-reset-of-i2sr_ial-flag.patch
deleted file mode 100644 (file)
index 9f32449..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian Eggers <ceggers@arri.de>
-
-commit fa4d30556883f2eaab425b88ba9904865a4d00f3 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().
-
-Signed-off-by: Christian Eggers <ceggers@arri.de>
-Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-imx.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-imx.c
-+++ b/drivers/i2c/busses/i2c-imx.c
-@@ -412,6 +412,19 @@ static void i2c_imx_dma_free(struct 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 W1C and Vybrid uses W0C.
-+       */
-+      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, bool atomic)
- {
-       unsigned long orig_jiffies = jiffies;
-@@ -424,8 +437,7 @@ static int i2c_imx_bus_busy(struct imx_i
-               /* 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;
-               }
-@@ -623,9 +635,7 @@ static irqreturn_t i2c_imx_isr(int irq,
-       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;
-       }
index 35433793c0270977063770dbbe785a2f60afc0e6..5cb7d4f808576c49d5304b01c3789a0173c698c3 100644 (file)
@@ -114,7 +114,6 @@ mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-kh
 tcp-fix-receive-window-update-in-tcp_add_backlog.patch
 netlink-fix-policy-dump-leak.patch
 net-core-check-length-before-updating-ethertype-in-skb_mpls_-push-pop.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 net-bridge-fdb-don-t-flush-ext_learn-entries.patch
 net-tls-race-causes-kernel-panic.patch
 net-mlx5e-fix-driver-s-declaration-to-support-gre-offload.patch