aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/serial.c
diff options
context:
space:
mode:
authorCory Maccarrone <darkstar6262@gmail.com>2010-08-02 07:21:39 -0400
committerTony Lindgren <tony@atomide.com>2010-08-02 07:21:39 -0400
commit8b8fbd39e20b5db95f8f4b3bda4c9d3fcf8e3afc (patch)
tree2e164da265d61b97cf2edfa55579032e24dd77df /arch/arm/mach-omap1/serial.c
parent35ddf7c003f54fc9878a15384beb9a900d40319d (diff)
omap1: omap7xx clocks, mux, serial fixes
This change adds in the necessary clocks and mux pins for UART control on omap7xx devices. I also made a change in the serial code to only try and initialize two UARTs in omap_serial_init, as these devices don't have three. Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
-rw-r--r--arch/arm/mach-omap1/serial.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 349de90194e3..b78d0749f13d 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -122,6 +122,13 @@ void __init omap_serial_init(void)
122 122
123 for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) { 123 for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) {
124 124
125 /* Don't look at UARTs higher than 2 for omap7xx */
126 if (cpu_is_omap7xx() && i > 1) {
127 serial_platform_data[i].membase = NULL;
128 serial_platform_data[i].mapbase = 0;
129 continue;
130 }
131
125 /* Static mapping, never released */ 132 /* Static mapping, never released */
126 serial_platform_data[i].membase = 133 serial_platform_data[i].membase =
127 ioremap(serial_platform_data[i].mapbase, SZ_2K); 134 ioremap(serial_platform_data[i].mapbase, SZ_2K);