Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a964abe authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

serial: sh-sci: Preserve SCIFA/SCIFB bit rate config for serial console 



SCIFA and SCIFB have additional bit rate config bits in the Serial Mode
Register.  Don't touch them when using the port as a serial console, as
we rely on the boot loader to have configured the serial port config.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95ee05c7

drivers/tty/serial/sh-sci.c

+2 −1
Original line number Diff line number Diff line
@@ -2202,7 +2202,8 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, 
	} else {

		/* Don't touch the bit rate configuration */

		scr_val = s->cfg->scscr & (SCSCR_CKE1 | SCSCR_CKE0);

		smr_val |= serial_port_in(port, SCSMR) & SCSMR_CKS;

		smr_val |= serial_port_in(port, SCSMR) &

			   (SCSMR_CKEDG | SCSMR_SRC_MASK | SCSMR_CKS);

		dev_dbg(port->dev, "SCR 0x%x SMR 0x%x\n", scr_val, smr_val);

		serial_port_out(port, SCSCR, scr_val);

		serial_port_out(port, SCSMR, smr_val);