diff options
| author |   Tony Lindgren <tony@atomide.com> | 2006-02-08 22:06:47 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2006-02-08 22:06:47 +0000 |
| commit | 18f49ea207fbcf37f81395037f0dc1cacb2aac3c (patch) | |
| tree | 8c68c2093940b64924ea806d4cc2f5386ad42fc9 | |
| parent | [ARM] 3280/1: OMAP: 2/3 Fix low-level io init for omap1 boards (diff) | |
| download | linux-dev-18f49ea207fbcf37f81395037f0dc1cacb2aac3c.tar.xz linux-dev-18f49ea207fbcf37f81395037f0dc1cacb2aac3c.zip | |
[ARM] 3278/1: OMAP: 3/3 Fix low-level io init for omap2 boards
Patch from Tony Lindgren
This patch fixes the low-level IO init for omap2 boards.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index b937123e5c65..eaecbf422d8c 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -33,6 +33,7 @@ static void __init omap_generic_init_irq(void) { + omap2_init_common_hw(); omap_init_irq(); } @@ -64,7 +65,7 @@ static void __init omap_generic_init(void) static void __init omap_generic_map_io(void) { - omap_map_common_io(); + omap2_map_common_io(); } MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index c3c35d40378a..a300d634d8a5 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -136,6 +136,7 @@ static inline void __init h4_init_smc91x(void) static void __init omap_h4_init_irq(void) { + omap2_init_common_hw(); omap_init_irq(); omap_gpio_init(); h4_init_smc91x(); @@ -181,7 +182,7 @@ static void __init omap_h4_init(void) static void __init omap_h4_map_io(void) { - omap_map_common_io(); + omap2_map_common_io(); } MACHINE_START(OMAP_H4, "OMAP2420 H4 board") |