diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index d839c0506d8e..41b0a2fe0b04 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -412,7 +412,7 @@ static struct omap2_hsmmc_info mmc[] = { | |||
412 | .caps = MMC_CAP_4_BIT_DATA, | 412 | .caps = MMC_CAP_4_BIT_DATA, |
413 | .gpio_cd = -EINVAL, | 413 | .gpio_cd = -EINVAL, |
414 | .gpio_wp = -EINVAL, | 414 | .gpio_wp = -EINVAL, |
415 | 415 | .deferred = true, | |
416 | }, | 416 | }, |
417 | { | 417 | { |
418 | .mmc = 2, | 418 | .mmc = 2, |
@@ -436,7 +436,7 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = { | |||
436 | .reset_gpio_port[2] = -EINVAL | 436 | .reset_gpio_port[2] = -EINVAL |
437 | }; | 437 | }; |
438 | 438 | ||
439 | static void cm_t35_init_usbh(void) | 439 | static void __init cm_t35_init_usbh(void) |
440 | { | 440 | { |
441 | int err; | 441 | int err; |
442 | 442 | ||
@@ -470,7 +470,7 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, | |||
470 | 470 | ||
471 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 471 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
472 | mmc[0].gpio_cd = gpio + 0; | 472 | mmc[0].gpio_cd = gpio + 0; |
473 | omap2_hsmmc_init(mmc); | 473 | omap_hsmmc_late_init(mmc); |
474 | 474 | ||
475 | return 0; | 475 | return 0; |
476 | } | 476 | } |
@@ -638,6 +638,7 @@ static void __init cm_t3x_common_init(void) | |||
638 | omap_serial_init(); | 638 | omap_serial_init(); |
639 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | 639 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, |
640 | mt46h32m32lf6_sdrc_params); | 640 | mt46h32m32lf6_sdrc_params); |
641 | omap_hsmmc_init(mmc); | ||
641 | cm_t35_init_i2c(); | 642 | cm_t35_init_i2c(); |
642 | omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL); | 643 | omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL); |
643 | cm_t35_init_ethernet(); | 644 | cm_t35_init_ethernet(); |