drop serial-imx-restore-handshaking-irq-for-imx1.patch from 4.9 and 4.14

diff --git a/queue-4.14/serial-imx-restore-handshaking-irq-for-imx1.patch b/queue-4.14/serial-imx-restore-handshaking-irq-for-imx1.patch
deleted file mode 100644 (file)
index a0448b2..0000000
--- a/queue-4.14/serial-imx-restore-handshaking-irq-for-imx1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7e620984b62532783912312e334f3c48cdacbd5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Thu, 20 Sep 2018 14:11:17 +0200
-Subject: serial: imx: restore handshaking irq for imx1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 7e620984b62532783912312e334f3c48cdacbd5d upstream.
-
-Back in 2015 when irda was dropped from the driver imx1 was broken. This
-change reintroduces the support for the third interrupt of the UART.
-
-Fixes: afe9cbb1a6ad ("serial: imx: drop support for IRDA")
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/tty/serial/imx.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -2213,6 +2213,14 @@ static int serial_imx_probe(struct platf
-                               ret);
-                       return ret;
-               }
-+
-+              ret = devm_request_irq(&pdev->dev, rtsirq, imx_uart_rtsint, 0,
-+                                     dev_name(&pdev->dev), sport);
-+              if (ret) {
-+                      dev_err(&pdev->dev, "failed to request rts irq: %d\n",
-+                              ret);
-+                      return ret;
-+              }
-       } else {
-               ret = devm_request_irq(&pdev->dev, rxirq, imx_int, 0,
-                                      dev_name(&pdev->dev), sport);

diff --git a/queue-4.14/series b/queue-4.14/series
index f7e95e7a751a0c8a54cd1567fe2999e84a7a4d08..8f98bb161aabb9f994448950ff34b20887204746 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -84,7 +84,6 @@ arm-dts-dra7-fix-dcan-node-addresses.patch
 floppy-do-not-copy-a-kernel-pointer-to-user-memory-in-fdgetprm-ioctl.patch
 x86-mm-expand-static-page-table-for-fixmap-space.patch
 tty-serial-lpuart-avoid-leaking-struct-tty_struct.patch
-serial-imx-restore-handshaking-irq-for-imx1.patch
 serial-cpm_uart-return-immediately-from-console-poll.patch
 intel_th-fix-device-removal-logic.patch
 spi-tegra20-slink-explicitly-enable-disable-clock.patch

diff --git a/queue-4.9/serial-imx-restore-handshaking-irq-for-imx1.patch b/queue-4.9/serial-imx-restore-handshaking-irq-for-imx1.patch
deleted file mode 100644 (file)
index 9b04984..0000000
--- a/queue-4.9/serial-imx-restore-handshaking-irq-for-imx1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7e620984b62532783912312e334f3c48cdacbd5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Thu, 20 Sep 2018 14:11:17 +0200
-Subject: serial: imx: restore handshaking irq for imx1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 7e620984b62532783912312e334f3c48cdacbd5d upstream.
-
-Back in 2015 when irda was dropped from the driver imx1 was broken. This
-change reintroduces the support for the third interrupt of the UART.
-
-Fixes: afe9cbb1a6ad ("serial: imx: drop support for IRDA")
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/tty/serial/imx.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -2197,6 +2197,14 @@ static int serial_imx_probe(struct platf
-                               ret);
-                       return ret;
-               }
-+
-+              ret = devm_request_irq(&pdev->dev, rtsirq, imx_uart_rtsint, 0,
-+                                     dev_name(&pdev->dev), sport);
-+              if (ret) {
-+                      dev_err(&pdev->dev, "failed to request rts irq: %d\n",
-+                              ret);
-+                      return ret;
-+              }
-       } else {
-               ret = devm_request_irq(&pdev->dev, rxirq, imx_int, 0,
-                                      dev_name(&pdev->dev), sport);

diff --git a/queue-4.9/series b/queue-4.9/series
index 70f06c2deb5757b0e8a28c88a9b2a37b5c9f3bb4..435890cc970c6df47b6ef94d76bedf20e1b701ab 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -55,7 +55,6 @@ edac-fix-memleak-in-module-init-error-path.patch
 arm-dts-dra7-fix-dcan-node-addresses.patch
 floppy-do-not-copy-a-kernel-pointer-to-user-memory-in-fdgetprm-ioctl.patch
 tty-serial-lpuart-avoid-leaking-struct-tty_struct.patch
-serial-imx-restore-handshaking-irq-for-imx1.patch
 serial-cpm_uart-return-immediately-from-console-poll.patch
 spi-tegra20-slink-explicitly-enable-disable-clock.patch
 spi-sh-msiof-fix-invalid-spi-use-during-system-suspend.patch