From: Greg Kroah-Hartman Date: Sun, 30 Sep 2018 01:02:04 +0000 (-0700) Subject: drop serial-imx-restore-handshaking-irq-for-imx1.patch from 4.9 and 4.14 X-Git-Tag: v4.18.12~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=564e573ccf7f34bcfca7349e7f3ed3de5968d1ef;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index a0448b29f54..00000000000 --- 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?= -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 - -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 -Signed-off-by: Uwe Kleine-König -Reviewed-by: Leonard Crestez -Signed-off-by: Greg Kroah-Hartman - ---- - 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 f7e95e7a751..8f98bb161aa 100644 --- 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 index 9b04984c328..00000000000 --- 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?= -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 - -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 -Signed-off-by: Uwe Kleine-König -Reviewed-by: Leonard Crestez -Signed-off-by: Greg Kroah-Hartman - ---- - 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 70f06c2deb5..435890cc970 100644 --- 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