]> 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>
Tue, 1 Dec 2020 08:45:11 +0000 (09:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 1 Dec 2020 08:45:11 +0000 (09:45 +0100)
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

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 bc07315..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Sat Nov 28 03:53:05 PM CET 2020
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-
-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>
-[sudip: adjust context]
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-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
-@@ -413,6 +413,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;
-@@ -425,8 +438,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 42809c020c991c8778a768f7ebf6d28d025ba95d..b2076770da6849c4fa3acd19eacc533a89be9ce8 100644 (file)
@@ -9,7 +9,6 @@ btrfs-inode-verify-inode-mode-to-avoid-null-pointer-dereference.patch
 kvm-x86-fix-split-irqchip-vs-interrupt-injection-window-request.patch
 arm64-pgtable-fix-pte_accessible.patch
 arm64-pgtable-ensure-dirty-bit-is-preserved-across-pte_wrprotect.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 alsa-hda-hdmi-use-single-mutex-unlock-in-error-paths.patch
 alsa-hda-hdmi-fix-incorrect-locking-in-hdmi_pcm_close.patch
 hid-cypress-support-varmilo-keyboards-media-hotkeys.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 4c19bd1..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Sat Nov 28 03:53:01 PM CET 2020
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-
-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>
-[sudip: adjust context]
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-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 0ad72b0fbaa2bdfc571ece28680d89524f093eea..4f1bbf5b9b8e5fdf9fbd7c2a85a908c901fb460e 100644 (file)
@@ -9,7 +9,6 @@ kvm-x86-fix-split-irqchip-vs-interrupt-injection-window-request.patch
 arm64-pgtable-fix-pte_accessible.patch
 arm64-pgtable-ensure-dirty-bit-is-preserved-across-pte_wrprotect.patch
 drm-atomic_helper-stop-modesets-on-unregistered-connectors-harder.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 alsa-hda-hdmi-fix-incorrect-locking-in-hdmi_pcm_close.patch
 hid-cypress-support-varmilo-keyboards-media-hotkeys.patch
 hid-add-support-for-sega-saturn.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 e9ea86b..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Sat Nov 28 03:53:42 PM CET 2020
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-
-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>
-[sudip: adjust context]
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-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 f01891f7979f2e5ae261d4e822129d23f55de635..f5b15150b7bb342012172c9b5729338107691e6d 100644 (file)
@@ -1,7 +1,6 @@
 btrfs-tree-checker-enhance-chunk-checker-to-validate-chunk-profile.patch
 btrfs-inode-verify-inode-mode-to-avoid-null-pointer-dereference.patch
 kvm-x86-fix-split-irqchip-vs-interrupt-injection-window-request.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 hid-cypress-support-varmilo-keyboards-media-hotkeys.patch
 input-i8042-allow-insmod-to-succeed-on-devices-witho.patch
 hid-hid-sensor-hub-fix-issue-with-devices-with-no-re.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 f24caaf..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Sat Nov 28 03:53:09 PM CET 2020
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-
-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>
-[sudip: adjust context]
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-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
-@@ -413,6 +413,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;
-@@ -425,8 +438,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 fbc1126609b79030a8b6d9fde1754aacc2c22556..e1c60ddcb6f0ad27dd98ae50fb7e5a66bd8cfc95 100644 (file)
@@ -6,7 +6,6 @@ btrfs-tree-checker-enhance-chunk-checker-to-validate-chunk-profile.patch
 btrfs-inode-verify-inode-mode-to-avoid-null-pointer-dereference.patch
 kvm-x86-fix-split-irqchip-vs-interrupt-injection-window-request.patch
 arm64-pgtable-fix-pte_accessible.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 alsa-hda-hdmi-use-single-mutex-unlock-in-error-paths.patch
 alsa-hda-hdmi-fix-incorrect-locking-in-hdmi_pcm_close.patch
 hid-cypress-support-varmilo-keyboards-media-hotkeys.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 b1ad42c..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Sat Nov 28 03:52:58 PM CET 2020
-From: Christian Eggers <ceggers@arri.de>
-Date: Wed, 7 Oct 2020 10:45:22 +0200
-Subject: i2c: imx: Fix reset of I2SR_IAL flag
-
-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>
-[sudip: adjust context]
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-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 bdf3971b6ad31298c8b7e6cb8df8429cbb625fdd..8a021eba365634304ef74e8d803d39f3fe7a51a9 100644 (file)
@@ -18,7 +18,6 @@ kvm-x86-fix-split-irqchip-vs-interrupt-injection-window-request.patch
 trace-fix-potenial-dangerous-pointer.patch
 arm64-pgtable-fix-pte_accessible.patch
 arm64-pgtable-ensure-dirty-bit-is-preserved-across-pte_wrprotect.patch
-i2c-imx-fix-reset-of-i2sr_ial-flag.patch
 hid-uclogic-add-id-for-trust-flex-design-tablet.patch
 hid-ite-replace-abs_misc-120-121-events-with-touchpa.patch
 hid-cypress-support-varmilo-keyboards-media-hotkeys.patch