diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-03 15:41:55 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-03 15:41:55 (GMT) |
| commit | 61f4a10cb4e9447a85245c63b3e7f46e09299fed (patch) | |
| tree | 6fdf82a99d38a035b0876b6dbce5b53a36084700 /arch/arm/mach-omap2/serial.c | |
| parent | 412bb0a6224f96661c042a109c4978649c00ed52 (diff) | |
| parent | 78a1a6d3411de1a8b0dc1cb92754b5f12f251912 (diff) | |
| download | linux-61f4a10cb4e9447a85245c63b3e7f46e09299fed.tar.xz | |
Merge branch 'omap4_upstream' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel-stable
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index b094c15..c0bea75 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -97,6 +97,16 @@ static struct plat_serial8250_port serial_platform_data[] = { .regshift = 2, .uartclk = OMAP24XX_BASE_BAUD * 16, }, { +#ifdef CONFIG_ARCH_OMAP4 + .membase = IO_ADDRESS(OMAP_UART4_BASE), + .mapbase = OMAP_UART4_BASE, + .irq = 70, + .flags = UPF_BOOT_AUTOCONF, + .iotype = UPIO_MEM, + .regshift = 2, + .uartclk = OMAP24XX_BASE_BAUD * 16, + }, { +#endif .flags = 0 } }; |