Subject: Re: [PATCH AUTOSEL 5.5 222/542] Revert "tty/serial: atmel: fix out of range clock divider handling"

From: Greg Kroah-Hartman <[email-masked]>
Date: Fri, 14 Feb 2020 16:51:34 -0500

On Fri, Feb 14, 2020 at 10:43:34AM -0500, Sasha Levin wrote:
> From: Greg Kroah-Hartman <[email-masked]>
> 
> [ Upstream commit 6dbd54e4154dfe386b3333687de15be239576617 ]
> 
> This reverts commit 751d0017334db9c4d68a8909c59f662a6ecbcec6.
> 
> The wrong commit got added to the tty-next tree, the correct one is in
> the tty-linus branch.
> 
> Reported-by: Stephen Rothwell <[email-masked]>
> Cc: David Engraf <[email-masked]>
> Signed-off-by: Greg Kroah-Hartman <[email-masked]>
> Signed-off-by: Sasha Levin <[email-masked]>
> ---
>  drivers/tty/serial/atmel_serial.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index 1ba9bc667e136..ab4d4a0b36497 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -2270,6 +2270,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
>  		mode |= ATMEL_US_USMODE_NORMAL;
>  	}
>  
> +	/* set the mode, clock divisor, parity, stop bits and data size */
> +	atmel_uart_writel(port, ATMEL_US_MR, mode);
> +
>  	/*
>  	 * Set the baud rate:
>  	 * Fractional baudrate allows to setup output frequency more
> -- 
> 2.20.1
> 

Are you sure this is correct to be added?  This was the result of some
fun merge problems, I don't think it's needed anywhere else...

greg k-h

_______________________________________________
linux-arm-kernel mailing list
[email-masked]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel