Commit 5668545a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: improve is_omap_port() 



Make is_omap_port() take the uart_8250_port structure so it can do
whatever test it desires.  Convert the test to compare the physical
addresses rather than virtual addresses.

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

arch/arm/plat-omap/include/mach/serial.h

+6 −6
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#define OMAP1510_BASE_BAUD	(12000000/16)

#define OMAP16XX_BASE_BAUD	(48000000/16)



#define is_omap_port(p)	({int __ret = 0;			\

			if (p == IO_ADDRESS(OMAP_UART1_BASE) ||	\

			    p == IO_ADDRESS(OMAP_UART2_BASE) ||	\

			    p == IO_ADDRESS(OMAP_UART3_BASE))	\

#define is_omap_port(pt)	({int __ret = 0;			\

			if ((pt)->port.mapbase == OMAP_UART1_BASE ||	\

			    (pt)->port.mapbase == OMAP_UART2_BASE ||	\

			    (pt)->port.mapbase == OMAP_UART3_BASE)	\

				__ret = 1;				\

			__ret;						\

			})

drivers/serial/8250.c

+1 −1
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, 


#ifdef CONFIG_ARCH_OMAP15XX

	/* Workaround to enable 115200 baud on OMAP1510 internal ports */

	if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) {

	if (cpu_is_omap1510() && is_omap_port(up)) {

		if (baud == 115200) {

			quot = 1;

			serial_out(up, UART_OMAP_OSC_12M_SEL, 1);