Skip to contentSkip to conversation

FAILED: patch "[PATCH] serial: imx: restore handshaking irq for imx1" failed to apply to 4.4-stable tree

PATCH In review [email protected] 3 participants 3 messages Sep 30, 2018 – Oct 2, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.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]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 7e620984b62532783912312e334f3c48cdacbd5d Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
Date: Thu, 20 Sep 2018 14:11:17 +0200
Subject: [PATCH] serial: imx: restore handshaking irq for imx1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <[email protected]>
drivers/tty/serial/imx.c +8 -0
index 239c0fa2e981..0f67197a3783 100644
@@ -2351,6 +2351,14 @@ static int imx_uart_probe(struct platform_device *pdev)
 				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_uart_int, 0,
 				       dev_name(&pdev->dev), sport);
#1 lore raw

PATCH 1/1 serial: imx: restore handshaking irq for imx1

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 <[email protected]>
[ukl: backport to 4.4.y which has changed context and different function names]

---
Hello,

this is the backport for v4.4.y. The changed context is that a failure to request the other irqs doesn't emit an error message which was added in commit 1e512d45332bb3a2e97ca262101d43adca274bb2. I still kept the error message for the added function as does the original commit.

Best regards
Uwe

 drivers/tty/serial/imx.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/tty/serial/imx.c +8 -0
index 07ede982b472..f5f46c121ee3 100644
@@ -1997,6 +1997,14 @@ static int serial_imx_probe(struct platform_device *pdev)
 				       dev_name(&pdev->dev), sport);
 		if (ret)
 			return ret;
+
+		ret = devm_request_irq(&pdev->dev, rtsirq, imx_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);
Signature · 1 line
2.19.0
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH v4.4.y] serial: imx: restore handshaking irq for imx1

Quoted 12 lines · 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 <[email protected]>
[ukl: backport to 4.4.y which has changed context and different function names]
Quoted 7 lines

---
Hello,

this is the backport for v4.4.y. The changed context is that a failure to request the other irqs doesn't emit an error message which was added in commit 1e512d45332bb3a2e97ca262101d43adca274bb2. I still kept the error message for the added function as does the original commit.

Not sure this is needed but I looked over this backport as well: