From: Geert Uytterhoeven Date: Mon, 4 Jan 2016 13:45:19 +0000 (+0100) Subject: serial: sh-sci: Preserve SCIFA/SCIFB bit rate config for serial console X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3a964abe1ef1cfbe82d0ae832d70c7750d673728;p=deliverable%2Flinux.git 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: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 65f717395086..b175f8f565d8 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2202,7 +2202,8 @@ done: } 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);