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

Commit 4f2c49fe authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Clean the serial port defines 



This way we don't have conflicts with the defines
with compiling in multiple omaps. Set the addresses
for uarts in struct omap_globals for the early serial
init code.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4e6d488a

arch/arm/mach-omap1/include/mach/debug-macro.S

+10 −6
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
 *

*/



#include <linux/serial_reg.h>



#include <plat/serial.h>



		.macro	addruart, rx, tmp

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1			@ MMU enabled?
@@ -30,13 +34,13 @@ 
		.endm



		.macro	busyuart,rd,rx

1001:		ldrb	\rd, [\rx, #(0x5 << 2)]	@ OMAP-1510 and friends

		and	\rd, \rd, #0x60

		teq	\rd, #0x60

1001:		ldrb	\rd, [\rx, #(UART_LSR << OMAP_PORT_SHIFT)]

		and	\rd, \rd, #(UART_LSR_TEMT | UART_LSR_THRE)

		teq	\rd, #(UART_LSR_TEMT | UART_LSR_THRE)

		beq	1002f

		ldrb	\rd, [\rx, #(0x5 << 0)]	@ OMAP-730 only

		and	\rd, \rd, #0x60

		teq	\rd, #0x60

		ldrb	\rd, [\rx, #(UART_LSR << OMAP7XX_PORT_SHIFT)]

		and	\rd, \rd, #(UART_LSR_TEMT | UART_LSR_THRE)

		teq	\rd, #(UART_LSR_TEMT | UART_LSR_THRE)

		bne	1001b

1002:

		.endm

arch/arm/mach-omap1/serial.c

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p) 


static struct plat_serial8250_port serial_platform_data[] = {

	{

		.mapbase	= OMAP_UART1_BASE,

		.mapbase	= OMAP1_UART1_BASE,

		.irq		= INT_UART1,

		.flags		= UPF_BOOT_AUTOCONF,

		.iotype		= UPIO_MEM,
@@ -72,7 +72,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.uartclk	= OMAP16XX_BASE_BAUD * 16,

	},

	{

		.mapbase	= OMAP_UART2_BASE,

		.mapbase	= OMAP1_UART2_BASE,

		.irq		= INT_UART2,

		.flags		= UPF_BOOT_AUTOCONF,

		.iotype		= UPIO_MEM,
@@ -80,7 +80,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.uartclk	= OMAP16XX_BASE_BAUD * 16,

	},

	{

		.mapbase	= OMAP_UART3_BASE,

		.mapbase	= OMAP1_UART3_BASE,

		.irq		= INT_UART3,

		.flags		= UPF_BOOT_AUTOCONF,

		.iotype		= UPIO_MEM,

arch/arm/mach-omap2/board-3630sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 


static void __init omap_sdp_map_io(void)

{

	omap2_set_globals_343x();

	omap2_set_globals_36xx();

	omap2_map_common_io();

}

arch/arm/mach-omap2/board-zoom3.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


static void __init omap_zoom_map_io(void)

{

	omap2_set_globals_343x();

	omap2_set_globals_36xx();

	omap2_map_common_io();

}

arch/arm/mach-omap2/include/mach/debug-macro.S

+7 −8
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
 *

*/



#include <linux/serial_reg.h>



#include <plat/serial.h>



		.macro	addruart, rx, tmp

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1			@ MMU enabled?
@@ -44,15 +48,10 @@ 
		.endm



		.macro	busyuart,rd,rx

1001:		ldrb	\rd, [\rx, #(0x5 << 2)]	@ OMAP-1510 and friends

		and	\rd, \rd, #0x60

		teq	\rd, #0x60

		beq	1002f

		ldrb	\rd, [\rx, #(0x5 << 0)]	@ OMAP-730 only

		and	\rd, \rd, #0x60

		teq	\rd, #0x60

1001:		ldrb	\rd, [\rx, #(UART_LSR << OMAP_PORT_SHIFT)]

		and	\rd, \rd, #(UART_LSR_TEMT | UART_LSR_THRE)

		teq	\rd, #(UART_LSR_TEMT | UART_LSR_THRE)

		bne	1001b

1002:

		.endm



		.macro	waituart,rd,rx