diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-10-06 00:14:02 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-10-20 01:34:10 +0200 |
| commit | 7b88e62f5d219a86d81bdf4388012c97dc42e8f8 (patch) | |
| tree | 174143f866565578b15b3fc368b23e906a878a55 /arch/arm/mach-omap1/board-palmz71.c | |
| parent | Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux... (diff) | |
| download | linux-7b88e62f5d219a86d81bdf4388012c97dc42e8f8.tar.xz linux-7b88e62f5d219a86d81bdf4388012c97dc42e8f8.zip | |
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-palmz71.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 9b0ea48d35fd..8e0887375f7e 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@ -57,13 +57,6 @@ #define PALMZ71_SLIDER_GPIO OMAP_MPUIO(3) #define PALMZ71_MMC_IN_GPIO OMAP_MPUIO(4) -static void __init -omap_palmz71_init_irq(void) -{ - omap1_init_common_hw(); - omap1_init_irq(); -} - static const unsigned int palmz71_keymap[] = { KEY(0, 0, KEY_F1), KEY(1, 0, KEY_F2), @@ -334,17 +327,12 @@ omap_palmz71_init(void) palmz71_gpio_setup(0); } -static void __init -omap_palmz71_map_io(void) -{ - omap1_map_common_io(); -} - MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") .boot_params = 0x10000100, - .map_io = omap_palmz71_map_io, + .map_io = omap15xx_map_io, + .init_early = omap1_init_early, .reserve = omap_reserve, - .init_irq = omap_palmz71_init_irq, + .init_irq = omap1_init_irq, .init_machine = omap_palmz71_init, .timer = &omap1_timer, MACHINE_END |