Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "tty: xilinx_uartps: Fix missing id assignment to the console"

This reverts commit 2ae11c46d5fdc46cb396e35911c713d271056d35.

It turned out to break the ultra96-rev1, e.g., which uses uart1 as
serial0 (and stdout-path = "serial0:115200n8").

Fixes: 2ae11c46d5fd ("tty: xilinx_uartps: Fix missing id assignment to the console")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/f4092727-d8f5-5f91-2c9f-76643aace993@siemens.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jan Kiszka and committed by
Greg Kroah-Hartman
76ed2e10 22538565

-1
-1
drivers/tty/serial/xilinx_uartps.c
··· 1465 1465 cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS; 1466 1466 #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE 1467 1467 cdns_uart_uart_driver.cons = &cdns_uart_console; 1468 - cdns_uart_console.index = id; 1469 1468 #endif 1470 1469 1471 1470 rc = uart_register_driver(&cdns_uart_uart_driver);