diff options
-rw-r--r-- | arch/arm/mach-shmobile/board-kota2.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c index bd9a78424d6b..5e084b9a8404 100644 --- a/arch/arm/mach-shmobile/board-kota2.c +++ b/arch/arm/mach-shmobile/board-kota2.c | |||
@@ -56,7 +56,7 @@ static struct resource smsc9220_resources[] = { | |||
56 | .flags = IORESOURCE_MEM, | 56 | .flags = IORESOURCE_MEM, |
57 | }, | 57 | }, |
58 | [1] = { | 58 | [1] = { |
59 | .start = gic_spi(33), /* PINTA2 @ PORT144 */ | 59 | .start = SH73A0_PINT0_IRQ(2), /* PINTA2 */ |
60 | .flags = IORESOURCE_IRQ, | 60 | .flags = IORESOURCE_IRQ, |
61 | }, | 61 | }, |
62 | }; | 62 | }; |
@@ -317,18 +317,6 @@ static void __init kota2_map_io(void) | |||
317 | shmobile_setup_console(); | 317 | shmobile_setup_console(); |
318 | } | 318 | } |
319 | 319 | ||
320 | #define PINTER0A 0xe69000a0 | ||
321 | #define PINTCR0A 0xe69000b0 | ||
322 | |||
323 | void __init kota2_init_irq(void) | ||
324 | { | ||
325 | sh73a0_init_irq(); | ||
326 | |||
327 | /* setup PINT: enable PINTA2 as active low */ | ||
328 | __raw_writel(1 << 29, PINTER0A); | ||
329 | __raw_writew(2 << 10, PINTCR0A); | ||
330 | } | ||
331 | |||
332 | static void __init kota2_init(void) | 320 | static void __init kota2_init(void) |
333 | { | 321 | { |
334 | sh73a0_pinmux_init(); | 322 | sh73a0_pinmux_init(); |
@@ -447,7 +435,7 @@ struct sys_timer kota2_timer = { | |||
447 | 435 | ||
448 | MACHINE_START(KOTA2, "kota2") | 436 | MACHINE_START(KOTA2, "kota2") |
449 | .map_io = kota2_map_io, | 437 | .map_io = kota2_map_io, |
450 | .init_irq = kota2_init_irq, | 438 | .init_irq = sh73a0_init_irq, |
451 | .handle_irq = shmobile_handle_irq_gic, | 439 | .handle_irq = shmobile_handle_irq_gic, |
452 | .init_machine = kota2_init, | 440 | .init_machine = kota2_init, |
453 | .timer = &kota2_timer, | 441 | .timer = &kota2_timer, |