diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:07:51 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:07:51 -0400 |
commit | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch) | |
tree | 377327a40452c4282787f49456122bf1753a0255 /arch/arm/mach-omap2/board-am3517crane.c | |
parent | 6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (diff) | |
parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) |
Merge branch 'omap/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517crane.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517crane.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 933e9353cb37..9e1b2c248328 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
@@ -47,12 +47,6 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
47 | }; | 47 | }; |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | static void __init am3517_crane_init_early(void) | ||
51 | { | ||
52 | omap2_init_common_infrastructure(); | ||
53 | omap2_init_common_devices(NULL, NULL); | ||
54 | } | ||
55 | |||
56 | static struct usbhs_omap_board_data usbhs_bdata __initdata = { | 50 | static struct usbhs_omap_board_data usbhs_bdata __initdata = { |
57 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, | 51 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, |
58 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, | 52 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, |
@@ -70,6 +64,7 @@ static void __init am3517_crane_init(void) | |||
70 | 64 | ||
71 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 65 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
72 | omap_serial_init(); | 66 | omap_serial_init(); |
67 | omap_sdrc_init(NULL, NULL); | ||
73 | 68 | ||
74 | omap_board_config = am3517_crane_config; | 69 | omap_board_config = am3517_crane_config; |
75 | omap_board_config_size = ARRAY_SIZE(am3517_crane_config); | 70 | omap_board_config_size = ARRAY_SIZE(am3517_crane_config); |
@@ -101,7 +96,7 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") | |||
101 | .boot_params = 0x80000100, | 96 | .boot_params = 0x80000100, |
102 | .reserve = omap_reserve, | 97 | .reserve = omap_reserve, |
103 | .map_io = omap3_map_io, | 98 | .map_io = omap3_map_io, |
104 | .init_early = am3517_crane_init_early, | 99 | .init_early = am35xx_init_early, |
105 | .init_irq = omap3_init_irq, | 100 | .init_irq = omap3_init_irq, |
106 | .init_machine = am3517_crane_init, | 101 | .init_machine = am3517_crane_init, |
107 | .timer = &omap3_timer, | 102 | .timer = &omap3_timer, |