diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 6e0f0d2e39bc..bd1bcacb40f9 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -471,13 +471,6 @@ static void __init cm_t35_init_i2c(void) | |||
471 | omap3_pmic_init("tps65930", &cm_t35_twldata); | 471 | omap3_pmic_init("tps65930", &cm_t35_twldata); |
472 | } | 472 | } |
473 | 473 | ||
474 | static void __init cm_t35_init_early(void) | ||
475 | { | ||
476 | omap2_init_common_infrastructure(); | ||
477 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
478 | mt46h32m32lf6_sdrc_params); | ||
479 | } | ||
480 | |||
481 | #ifdef CONFIG_OMAP_MUX | 474 | #ifdef CONFIG_OMAP_MUX |
482 | static struct omap_board_mux board_mux[] __initdata = { | 475 | static struct omap_board_mux board_mux[] __initdata = { |
483 | /* nCS and IRQ for CM-T35 ethernet */ | 476 | /* nCS and IRQ for CM-T35 ethernet */ |
@@ -610,6 +603,8 @@ static void __init cm_t3x_common_init(void) | |||
610 | omap_board_config_size = ARRAY_SIZE(cm_t35_config); | 603 | omap_board_config_size = ARRAY_SIZE(cm_t35_config); |
611 | omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); | 604 | omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); |
612 | omap_serial_init(); | 605 | omap_serial_init(); |
606 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
607 | mt46h32m32lf6_sdrc_params); | ||
613 | cm_t35_init_i2c(); | 608 | cm_t35_init_i2c(); |
614 | omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL); | 609 | omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL); |
615 | cm_t35_init_ethernet(); | 610 | cm_t35_init_ethernet(); |
@@ -637,7 +632,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") | |||
637 | .atag_offset = 0x100, | 632 | .atag_offset = 0x100, |
638 | .reserve = omap_reserve, | 633 | .reserve = omap_reserve, |
639 | .map_io = omap3_map_io, | 634 | .map_io = omap3_map_io, |
640 | .init_early = cm_t35_init_early, | 635 | .init_early = omap35xx_init_early, |
641 | .init_irq = omap3_init_irq, | 636 | .init_irq = omap3_init_irq, |
642 | .init_machine = cm_t35_init, | 637 | .init_machine = cm_t35_init, |
643 | .timer = &omap3_timer, | 638 | .timer = &omap3_timer, |
@@ -647,7 +642,7 @@ MACHINE_START(CM_T3730, "Compulab CM-T3730") | |||
647 | .atag_offset = 0x100, | 642 | .atag_offset = 0x100, |
648 | .reserve = omap_reserve, | 643 | .reserve = omap_reserve, |
649 | .map_io = omap3_map_io, | 644 | .map_io = omap3_map_io, |
650 | .init_early = cm_t35_init_early, | 645 | .init_early = omap3630_init_early, |
651 | .init_irq = omap3_init_irq, | 646 | .init_irq = omap3_init_irq, |
652 | .init_machine = cm_t3730_init, | 647 | .init_machine = cm_t3730_init, |
653 | .timer = &omap3_timer, | 648 | .timer = &omap3_timer, |