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

Commit 18f360f8 authored by Russell King's avatar Russell King
Browse files

SERIAL: omap: simplify 



We have the sequence:
	- LCR mode B
	- write EFR with ECB clear
	- LCR mode normal
	- if s/w flow
		- LCR mode B
		- write EFR with ECB clear
		...
		- LCR mode B
		- write EFR with ECB clear
		- LCR mode normal

This can be simplified to:
	- if s/w flow
		- LCR mode B
		- write EFR with ECB clear
		...
	- LCR mode B
	- write EFR with ECB clear
	- LCR mode normal

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1fe8aa88

drivers/tty/serial/omap-serial.c

+4 −11
Original line number Diff line number Diff line
@@ -917,19 +917,11 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 


		/* Disable access to TCR/TLR */

		serial_out(up, UART_MCR, up->mcr);

		serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);

		serial_out(up, UART_EFR, up->efr);

		serial_out(up, UART_LCR, cval);

	} else {

		/* Disable AUTORTS and AUTOCTS */

		up->efr &= ~(UART_EFR_CTS | UART_EFR_RTS);



		serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);

		serial_out(up, UART_EFR, up->efr);

		serial_out(up, UART_LCR, cval);

	}



	/* Software Flow Control Configuration */

	if (up->port.flags & UPF_SOFT_FLOW) {

		serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);

		serial_out(up, UART_EFR, up->efr);
@@ -975,10 +967,11 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 
		serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);

		serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);

		serial_out(up, UART_MCR, up->mcr);

	}



	serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);

	serial_out(up, UART_EFR, up->efr);

	serial_out(up, UART_LCR, up->lcr);

	}



	serial_omap_set_mctrl(&up->port, up->port.mctrl);