diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index a0b851aafcca..ba9c118862e6 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -100,6 +100,7 @@ static struct omap2_hsmmc_info mmc[] = { | |||
100 | .mmc = 1, | 100 | .mmc = 1, |
101 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, | 101 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, |
102 | .gpio_wp = 29, | 102 | .gpio_wp = 29, |
103 | .deferred = true, | ||
103 | }, | 104 | }, |
104 | {} /* Terminator */ | 105 | {} /* Terminator */ |
105 | }; | 106 | }; |
@@ -125,7 +126,7 @@ static int touchbook_twl_gpio_setup(struct device *dev, | |||
125 | } | 126 | } |
126 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 127 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
127 | mmc[0].gpio_cd = gpio + 0; | 128 | mmc[0].gpio_cd = gpio + 0; |
128 | omap2_hsmmc_init(mmc); | 129 | omap_hsmmc_late_init(mmc); |
129 | 130 | ||
130 | /* REVISIT: need ehci-omap hooks for external VBUS | 131 | /* REVISIT: need ehci-omap hooks for external VBUS |
131 | * power switch and overcurrent detect | 132 | * power switch and overcurrent detect |
@@ -351,6 +352,7 @@ static void __init omap3_touchbook_init(void) | |||
351 | 352 | ||
352 | pm_power_off = omap3_touchbook_poweroff; | 353 | pm_power_off = omap3_touchbook_poweroff; |
353 | 354 | ||
355 | omap_hsmmc_init(mmc); | ||
354 | omap3_touchbook_i2c_init(); | 356 | omap3_touchbook_i2c_init(); |
355 | platform_add_devices(omap3_touchbook_devices, | 357 | platform_add_devices(omap3_touchbook_devices, |
356 | ARRAY_SIZE(omap3_touchbook_devices)); | 358 | ARRAY_SIZE(omap3_touchbook_devices)); |