Commit 2a31f094 authored May 11, 2016 by Stephen Boyd Committed by Greg Kroah-Hartman Jun 25, 2016

tty: serial: msm: Only configure MND registers on hw that has it



The registers that msm_serial_set_mnd_regs() writes only exist on
the non-uartdm hardware, so let's return early here if this
function is called on uartdm hardware. This also prevents us from
messing up the uartclk variable if the uartclk rate happens to be
19.2 or 4.8 MHz.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 32173741

drivers/tty/serial/msm_serial.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -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)