From 2036fd76350799bb2b53b309d0ac6d60692fe890 Mon Sep 17 00:00:00 2001 From: "Mathieu J. Poirier" Date: Fri, 19 Aug 2011 08:30:57 -0600 Subject: Temporary fix to bypass mmc card discovery problem The current 3.0 Snowball Android kernel has problem discovering the mmc card - the probing process seems overly long. Disabling the emmc and probing the mmc earlier in the boot process seems to help yielding a booting system. This should be reverted when the real solution is found. Signed-off-by: Mathieu Poirier --- arch/arm/mach-ux500/board-mop500-sdi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index b8104c919bc..e1fc157b22e 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -264,8 +264,16 @@ void __init mop500_sdi_init(void) db8500_add_sdi2(&mop500_sdi2_data, periphid); /* On-board eMMC */ - db8500_add_sdi4(&mop500_sdi4_data, periphid); + /* HACK Aleft - This needs to be reverted ! + * This kernel has problem discovering the SD card when it's + * assigned to mmc1, yielding an unusable android image. + * Disabling the emmc is not the right fix but allowing the + * SD card to be discovered earlier seems to help. + */ +#ifndef CONFIG_MACH_SNOWBALL + db8500_add_sdi4(&mop500_sdi4_data, periphid); +#endif if (machine_is_hrefv60() || machine_is_snowball()) { if (machine_is_hrefv60()) { mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO; -- cgit v1.2.3