Merge branch 'master' into jb-mr2

dazjo · Oct 27, 2013 · fb0a777 · fb0a777
2 parents c74366b + 21718ff
commit fb0a777
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/arch/arm/configs/u8815_defconfig b/arch/arm/configs/u8815_defconfig
@@ -2706,6 +2706,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
 # CONFIG_MMC_EMBEDDED_SDIO is not set
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_HUAWEI_NO_HYNIX_HACK=y
 
 #
 # MMC/SD/SDIO Card Drivers

diff --git a/arch/arm/configs/u8833_defconfig b/arch/arm/configs/u8833_defconfig
@@ -2712,6 +2712,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
 # CONFIG_MMC_EMBEDDED_SDIO is not set
 CONFIG_MMC_PARANOID_SD_INIT=y
+# CONFIG_HUAWEI_NO_HYNIX_HACK is not set
 
 #
 # MMC/SD/SDIO Card Drivers

diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
@@ -44,3 +44,6 @@ config MMC_PARANOID_SD_INIT
 	  about re-trying SD init requests. This can be a useful
 	  work-around for buggy controllers and hardware. Enable
 	  if you are experiencing issues with SD detection.
+
+config HUAWEI_NO_HYNIX_HACK
+	bool "Disable setting clock to 26MHz (hynix)."
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
@@ -1111,7 +1111,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 		max_dtr = card->csd.max_dtr;
 	}
 
-#ifdef CONFIG_HUAWEI_KERNEL
+#ifndef CONFIG_HUAWEI_NO_HYNIX_HACK
 	/* Set clk to 26MHz to fix hynix emmc CMD6 timeout issue. */
 	mmc_set_clock(host, MMC_HIGH_26_MAX_DTR);
 #endif