diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-16 16:34:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:34:33 -0700 |
| commit | b969c4a9c1bee55ef66675a7d0f96de8af9aec23 (patch) | |
| tree | f784922dd8efbefff51a84ca5156400686405ca9 | |
| parent | 8d9eda8a49f6a84edcfe6026afd9cd7c9a567e00 (diff) | |
| parent | 2ce98e59931440e69a94fcb5a9adaa9b7cc7a787 (diff) | |
Merge "tty: serial: msm: Only configure MND registers on hw that has it"
| -rw-r--r-- | drivers/tty/serial/msm_serial.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index c2e4ef934241..53677cbf3ca1 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -232,6 +232,15 @@ static void msm_serial_set_mnd_regs_tcxoby4(struct uart_port *port) static void msm_serial_set_mnd_regs(struct uart_port *port) { + struct msm_port *msm_port = UART_TO_MSM(port); + + /* + * These registers don't exist so we change the clk input rate + * on uartdm hardware instead + */ + if (msm_port->is_uartdm) + return; + if (port->uartclk == 19200000) msm_serial_set_mnd_regs_tcxo(port); else if (port->uartclk == 4800000) |