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-htcherald.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-htcherald.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-htcherald.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 36e06ea7ec65..67798dfc4f8d 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -500,7 +500,7 @@ static void __init htcherald_lcd_init(void) static void __init htcherald_map_io(void) { - omap1_map_common_io(); + omap7xx_map_io(); /* * The LCD panel must be disabled and DMA turned off here, as doing @@ -601,20 +601,14 @@ static void __init htcherald_init(void) #endif } -static void __init htcherald_init_irq(void) -{ - printk(KERN_INFO "htcherald_init_irq.\n"); - omap1_init_common_hw(); - omap1_init_irq(); -} - MACHINE_START(HERALD, "HTC Herald") /* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */ /* Maintainer: wing-linux.sourceforge.net */ .boot_params = 0x10000100, .map_io = htcherald_map_io, + .init_early = omap1_init_early, .reserve = omap_reserve, - .init_irq = htcherald_init_irq, + .init_irq = omap1_init_irq, .init_machine = htcherald_init, .timer = &omap1_timer, MACHINE_END |