Re: [PATCH] Revert "tty: xilinx_uartps: Fix missing id assignment to the console"

Michal Simek
2020-06-18T08:18:11Z

On 18. 06. 20 10:11, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This reverts commit 2ae11c46d5fdc46cb396e35911c713d271056d35.
>
> It turned out to break the ultra96-rev1, e.g., which uses uart1 as
> serial0 (and stdout-path = "serial0:115200n8").
>
> Cc: stable <stable@vger.kernel.org>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> drivers/tty/serial/xilinx_uartps.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
> index 35e9e8faf8de..ac137b6a1dc1 100644
> --- a/drivers/tty/serial/xilinx_uartps.c
> +++ b/drivers/tty/serial/xilinx_uartps.c
> @@ -1459,7 +1459,6 @@ 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);
>

Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal