diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index f7c09de2ed1c..9a114bd910b1 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -301,17 +301,6 @@ static struct omap_usb_config h4_usb_config __initdata = { | |||
301 | .hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */ | 301 | .hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */ |
302 | }; | 302 | }; |
303 | 303 | ||
304 | static void __init omap_h4_init_early(void) | ||
305 | { | ||
306 | omap2_init_common_infrastructure(); | ||
307 | omap2_init_common_devices(NULL, NULL); | ||
308 | } | ||
309 | |||
310 | static void __init omap_h4_init_irq(void) | ||
311 | { | ||
312 | omap2_init_irq(); | ||
313 | } | ||
314 | |||
315 | static struct at24_platform_data m24c01 = { | 304 | static struct at24_platform_data m24c01 = { |
316 | .byte_len = SZ_1K / 8, | 305 | .byte_len = SZ_1K / 8, |
317 | .page_size = 16, | 306 | .page_size = 16, |
@@ -379,24 +368,19 @@ static void __init omap_h4_init(void) | |||
379 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); | 368 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); |
380 | omap2_usbfs_init(&h4_usb_config); | 369 | omap2_usbfs_init(&h4_usb_config); |
381 | omap_serial_init(); | 370 | omap_serial_init(); |
371 | omap_sdrc_init(NULL, NULL); | ||
382 | h4_init_flash(); | 372 | h4_init_flash(); |
383 | 373 | ||
384 | omap_display_init(&h4_dss_data); | 374 | omap_display_init(&h4_dss_data); |
385 | } | 375 | } |
386 | 376 | ||
387 | static void __init omap_h4_map_io(void) | ||
388 | { | ||
389 | omap2_set_globals_242x(); | ||
390 | omap242x_map_common_io(); | ||
391 | } | ||
392 | |||
393 | MACHINE_START(OMAP_H4, "OMAP2420 H4 board") | 377 | MACHINE_START(OMAP_H4, "OMAP2420 H4 board") |
394 | /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */ | 378 | /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */ |
395 | .boot_params = 0x80000100, | 379 | .atag_offset = 0x100, |
396 | .reserve = omap_reserve, | 380 | .reserve = omap_reserve, |
397 | .map_io = omap_h4_map_io, | 381 | .map_io = omap242x_map_io, |
398 | .init_early = omap_h4_init_early, | 382 | .init_early = omap2420_init_early, |
399 | .init_irq = omap_h4_init_irq, | 383 | .init_irq = omap2_init_irq, |
400 | .init_machine = omap_h4_init, | 384 | .init_machine = omap_h4_init, |
401 | .timer = &omap2_timer, | 385 | .timer = &omap2_timer, |
402 | MACHINE_END | 386 | MACHINE_END |