summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2009-06-24 19:32:03 +0200
committerKevin Hilman <khilman@deeprootsystems.com>2009-08-05 18:10:52 +0200
commit4789998a30d845d94a7595076d1392ffd5a9d39e (patch)
treef42887079deba0986791f57a9f64683e9e24fb1b /arch/arm
parentOMAP3: PM: Do not build suspend code if SUSPEND is not enabled (diff)
downloadlinux-4789998a30d845d94a7595076d1392ffd5a9d39e.tar.xz
linux-4789998a30d845d94a7595076d1392ffd5a9d39e.zip
OMAP4: UART: cleanup special case IRQ handling
Streamline the OMAP4 special IRQ assignments by putting inside normal init loop instead of having a separate loop. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/serial.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index b094c15bfe47..c82ec95cd79e 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -496,10 +496,6 @@ void __init omap_serial_init(void)
if (info == NULL)
return;
- if (cpu_is_omap44xx()) {
- for (i = 0; i < OMAP_MAX_NR_PORTS; i++)
- serial_platform_data[i].irq += 32;
- }
for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
struct plat_serial8250_port *p = serial_platform_data + i;
@@ -533,6 +529,9 @@ void __init omap_serial_init(void)
uart->p = p;
list_add(&uart->node, &uart_list);
+ if (cpu_is_omap44xx())
+ p->irq += 32;
+
omap_uart_enable_clocks(uart);
omap_uart_reset(uart);
omap_uart_idle_init(uart);