linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tty: xilinx_uartps: Add the id to the console
@ 2020-04-30  8:11 Michal Simek
  2020-04-30  8:49 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 3+ messages in thread
From: Michal Simek @ 2020-04-30  8:11 UTC (permalink / raw)
  To: linux-kernel, monstr, michal.simek, git, stable
  Cc: Shubhrajyoti Datta, Greg Kroah-Hartman, Jiri Slaby,
	linux-arm-kernel, linux-serial

From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>

Update the console index. Once the serial node is found update it to the
console index.

Fixes: 18cc7ac8a28e ("Revert "serial: uartps: Register own uart console and driver structures"")
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Greg: Would be good if you can take this patch to 5.7 and also to stable
trees.
---
 drivers/tty/serial/xilinx_uartps.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 672cfa075e28..b9d672af8b65 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1465,6 +1465,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
 		cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS;
 #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
 		cdns_uart_uart_driver.cons = &cdns_uart_console;
+		cdns_uart_console.index = id;
 #endif
 
 		rc = uart_register_driver(&cdns_uart_uart_driver);
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-04-30  9:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-30  8:11 [PATCH] tty: xilinx_uartps: Add the id to the console Michal Simek
2020-04-30  8:49 ` Greg Kroah-Hartman
2020-04-30  9:02   ` Michal Simek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).