diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
| commit | f9baa031dd6bedc6d4b39e254e3b76cd2c37769b (patch) | |
| tree | 216e51a0dc73b76f8e7be6648ecf4ee7dbbceec1 /arch/arm/mach-omap1/serial.c | |
| parent | 21ee0ab5fa80eb7307079e1a126f642fe7a937a6 (diff) | |
| parent | d21872b3683ff37f73c68993749a6e6aeeaed265 (diff) | |
Merge commit 'd21872b'linaro_merge_100811
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 349de90194e..b78d0749f13 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); |