diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-10-05 15:14:02 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-10-19 16:34:10 -0700 |
| commit | 7b88e62f5d219a86d81bdf4388012c97dc42e8f8 (patch) | |
| tree | 174143f866565578b15b3fc368b23e906a878a55 /arch/arm/mach-omap1/board-generic.c | |
| parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) | |
| download | linux-7b88e62f5d219a86d81bdf4388012c97dc42e8f8.tar.bz2 | |
ARM: OMAP1: Use generic map_io, init_early and init_irq
This allows removing omap hacks for map_io allowing generic
map_io.
Note that in the future we can't do cpu_is_omapxxxx detection
until in init_early. This means that board-innovator.c now
assumes 15xx only, and board-generic.c assumes 16xx only.
This is best fixed later on by passing the SoC type from
device tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 04fc356c40fa..cc0cca7ee199 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -28,12 +28,6 @@ #include <plat/board.h> #include <plat/common.h> -static void __init omap_generic_init_irq(void) -{ - omap1_init_common_hw(); - omap1_init_irq(); -} - /* assume no Mini-AB port */ #ifdef CONFIG_ARCH_OMAP15XX @@ -87,17 +81,13 @@ static void __init omap_generic_init(void) omap_register_i2c_bus(1, 100, NULL, 0); } -static void __init omap_generic_map_io(void) -{ - omap1_map_common_io(); -} - MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") /* Maintainer: Tony Lindgren <tony@atomide.com> */ .boot_params = 0x10000100, - .map_io = omap_generic_map_io, + .map_io = omap16xx_map_io, + .init_early = omap1_init_early, .reserve = omap_reserve, - .init_irq = omap_generic_init_irq, + .init_irq = omap1_init_irq, .init_machine = omap_generic_init, .timer = &omap1_timer, MACHINE_END |