diff options
author | Tony Lindgren <tony@atomide.com> | 2011-10-05 18:14:02 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-10-19 19:34:10 -0400 |
commit | 7b88e62f5d219a86d81bdf4388012c97dc42e8f8 (patch) | |
tree | 174143f866565578b15b3fc368b23e906a878a55 /arch/arm/mach-omap1/board-palmtt.c | |
parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) |
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-palmtt.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index b214f45f646c..5ff3def49a85 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -263,12 +263,6 @@ static struct spi_board_info __initdata palmtt_boardinfo[] = { | |||
263 | } | 263 | } |
264 | }; | 264 | }; |
265 | 265 | ||
266 | static void __init omap_palmtt_init_irq(void) | ||
267 | { | ||
268 | omap1_init_common_hw(); | ||
269 | omap1_init_irq(); | ||
270 | } | ||
271 | |||
272 | static struct omap_usb_config palmtt_usb_config __initdata = { | 266 | static struct omap_usb_config palmtt_usb_config __initdata = { |
273 | .register_dev = 1, | 267 | .register_dev = 1, |
274 | .hmc_mode = 0, | 268 | .hmc_mode = 0, |
@@ -315,16 +309,12 @@ static void __init omap_palmtt_init(void) | |||
315 | omap_register_i2c_bus(1, 100, NULL, 0); | 309 | omap_register_i2c_bus(1, 100, NULL, 0); |
316 | } | 310 | } |
317 | 311 | ||
318 | static void __init omap_palmtt_map_io(void) | ||
319 | { | ||
320 | omap1_map_common_io(); | ||
321 | } | ||
322 | |||
323 | MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T") | 312 | MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T") |
324 | .boot_params = 0x10000100, | 313 | .boot_params = 0x10000100, |
325 | .map_io = omap_palmtt_map_io, | 314 | .map_io = omap15xx_map_io, |
315 | .init_early = omap1_init_early, | ||
326 | .reserve = omap_reserve, | 316 | .reserve = omap_reserve, |
327 | .init_irq = omap_palmtt_init_irq, | 317 | .init_irq = omap1_init_irq, |
328 | .init_machine = omap_palmtt_init, | 318 | .init_machine = omap_palmtt_init, |
329 | .timer = &omap1_timer, | 319 | .timer = &omap1_timer, |
330 | MACHINE_END | 320 | MACHINE_END |