Revert "msm: msm_sdcc: Add DDR support for eMMC/MMC"
This reverts commit 279aa8dd1dd7dabcb655d7f78c5304f3533b4d41.
CRs-Fixed: 300095
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index f47b3ce..2b4662b 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -2143,7 +2143,7 @@
};
static unsigned int sdc1_sup_clk_rates[] = {
- 400000, 24000000, 48000000, 96000000
+ 400000, 24000000, 48000000
};
static unsigned int sdc3_sup_clk_rates[] = {
@@ -2163,8 +2163,7 @@
.nonremovable = 1,
.sdcc_v4_sup = true,
.vreg_data = &mmc_slot_vreg_data[SDCC1],
- .pin_data = &mmc_slot_pin_data[SDCC1],
- .uhs_caps = MMC_CAP_1_8V_DDR
+ .pin_data = &mmc_slot_pin_data[SDCC1]
};
#endif
@@ -2186,7 +2185,7 @@
.xpc_cap = 1,
.uhs_caps = (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |
MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_DDR50 |
- MMC_CAP_MAX_CURRENT_600 | MMC_CAP_1_8V_DDR)
+ MMC_CAP_MAX_CURRENT_600)
};
#endif
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index a5fa1d9..dec8f431 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -2030,7 +2030,7 @@
* For DDR50 mode, controller needs clock rate to be
* double than what is required on the SD card CLK pin.
*/
- if (ios->ddr || (ios->timing == MMC_TIMING_UHS_DDR50)) {
+ if (ios->timing == MMC_TIMING_UHS_DDR50) {
/*
* Make sure that we don't double the clock if
* doubled clock rate is already set
@@ -2083,7 +2083,7 @@
(ios->timing == MMC_TIMING_UHS_SDR50)) {
clk |= (4 << 14);
host->tuning_needed = 1;
- } else if (ios->ddr || ios->timing == MMC_TIMING_UHS_DDR50) {
+ } else if (ios->timing == MMC_TIMING_UHS_DDR50) {
clk |= (3 << 14);
} else {
clk |= (2 << 14); /* feedback clock */