aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu J. Poirier <mathieu.poirier@linaro.org>2011-08-19 08:30:57 -0600
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2011-08-19 08:30:57 -0600
commit2036fd76350799bb2b53b309d0ac6d60692fe890 (patch)
treebabdbb7dcf1a96699869ded98f1b291e220340ea
parent9facc216c0ed2a27946b17a4bef887e33b033294 (diff)
downloadlinux-3.0-android-ux500-2036fd76350799bb2b53b309d0ac6d60692fe890.tar.gz
Temporary fix to bypass mmc card discovery problem2011.09
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 <mathieu.poirier@linaro.or>
-rw-r--r--arch/arm/mach-ux500/board-mop500-sdi.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index b8104c9..e1fc157 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;