diff options
| author | Cory Maccarrone <darkstar6262@gmail.com> | 2010-08-02 15:21:39 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 15:21:39 +0400 |
| commit | 8b8fbd39e20b5db95f8f4b3bda4c9d3fcf8e3afc (patch) | |
| tree | 2e164da265d61b97cf2edfa55579032e24dd77df /arch/arm/mach-omap1/serial.c | |
| parent | 35ddf7c003f54fc9878a15384beb9a900d40319d (diff) | |
| download | linux-8b8fbd39e20b5db95f8f4b3bda4c9d3fcf8e3afc.tar.xz | |
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.c | 7 |
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) for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) { + /* Don't look at UARTs higher than 2 for omap7xx */ + if (cpu_is_omap7xx() && i > 1) { + serial_platform_data[i].membase = NULL; + serial_platform_data[i].mapbase = 0; + continue; + } + /* Static mapping, never released */ serial_platform_data[i].membase = ioremap(serial_platform_data[i].mapbase, SZ_2K); |