Merge branch 'master' into jb-mr2

Daz Jones · Daz Jones · commit fb0a777e9bf4 · 2013-10-27T23:31:33.000Z
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

Original file line number	Diff line number	Diff line change
`@@ -2706,6 +2706,7 @@ CONFIG_MMC_UNSAFE_RESUME=y`
`2706`	`2706`	`CONFIG_MMC_CLKGATE=y`
`2707`	`2707`	`# CONFIG_MMC_EMBEDDED_SDIO is not set`
`2708`	`2708`	`CONFIG_MMC_PARANOID_SD_INIT=y`
	`2709`	`+CONFIG_HUAWEI_NO_HYNIX_HACK=y`
`2709`	`2710`
`2710`	`2711`	`#`
`2711`	`2712`	`# MMC/SD/SDIO Card Drivers`
Original file line number	Diff line number	Diff line change
`@@ -2712,6 +2712,7 @@ CONFIG_MMC_UNSAFE_RESUME=y`
`2712`	`2712`	`CONFIG_MMC_CLKGATE=y`
`2713`	`2713`	`# CONFIG_MMC_EMBEDDED_SDIO is not set`
`2714`	`2714`	`CONFIG_MMC_PARANOID_SD_INIT=y`
	`2715`	`+# CONFIG_HUAWEI_NO_HYNIX_HACK is not set`
`2715`	`2716`
`2716`	`2717`	`#`
`2717`	`2718`	`# MMC/SD/SDIO Card Drivers`
Original file line number	Diff line number	Diff line change
`@@ -1111,7 +1111,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,`
`1111`	`1111`	`max_dtr = card->csd.max_dtr;`
`1112`	`1112`	`}`
`1113`	`1113`
`1114`		`-#ifdef CONFIG_HUAWEI_KERNEL`
	`1114`	`+#ifndef CONFIG_HUAWEI_NO_HYNIX_HACK`
`1115`	`1115`	`/* Set clk to 26MHz to fix hynix emmc CMD6 timeout issue. */`
`1116`	`1116`	`mmc_set_clock(host, MMC_HIGH_26_MAX_DTR);`
`1117`	`1117`	`#endif`