|
|
@@ -297,7 +297,7 @@ struct msdc_host {
|
|
|
u32 mclk; /* mmc subsystem clock frequency */
|
|
|
u32 src_clk_freq; /* source clock frequency */
|
|
|
u32 sclk; /* SD/MS bus clock frequency */
|
|
|
- bool ddr;
|
|
|
+ unsigned char timing;
|
|
|
bool vqmmc_enabled;
|
|
|
struct msdc_save_para save_para; /* used when gate HCLK */
|
|
|
};
|
|
|
@@ -488,7 +488,7 @@ static void msdc_ungate_clock(struct msdc_host *host)
|
|
|
cpu_relax();
|
|
|
}
|
|
|
|
|
|
-static void msdc_set_mclk(struct msdc_host *host, int ddr, u32 hz)
|
|
|
+static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)
|
|
|
{
|
|
|
u32 mode;
|
|
|
u32 flags;
|
|
|
@@ -504,7 +504,8 @@ static void msdc_set_mclk(struct msdc_host *host, int ddr, u32 hz)
|
|
|
|
|
|
flags = readl(host->base + MSDC_INTEN);
|
|
|
sdr_clr_bits(host->base + MSDC_INTEN, flags);
|
|
|
- if (ddr) { /* may need to modify later */
|
|
|
+ if (timing == MMC_TIMING_UHS_DDR50 ||
|
|
|
+ timing == MMC_TIMING_MMC_DDR52) {
|
|
|
mode = 0x2; /* ddr mode and use divisor */
|
|
|
if (hz >= (host->src_clk_freq >> 2)) {
|
|
|
div = 0; /* mean div = 1/4 */
|
|
|
@@ -535,12 +536,12 @@ static void msdc_set_mclk(struct msdc_host *host, int ddr, u32 hz)
|
|
|
cpu_relax();
|
|
|
host->sclk = sclk;
|
|
|
host->mclk = hz;
|
|
|
- host->ddr = ddr;
|
|
|
+ host->timing = timing;
|
|
|
/* need because clk changed. */
|
|
|
msdc_set_timeout(host, host->timeout_ns, host->timeout_clks);
|
|
|
sdr_set_bits(host->base + MSDC_INTEN, flags);
|
|
|
|
|
|
- dev_dbg(host->dev, "sclk: %d, ddr: %d\n", host->sclk, ddr);
|
|
|
+ dev_dbg(host->dev, "sclk: %d, timing: %d\n", host->sclk, timing);
|
|
|
}
|
|
|
|
|
|
static inline u32 msdc_cmd_find_resp(struct msdc_host *host,
|
|
|
@@ -1158,14 +1159,9 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|
|
{
|
|
|
struct msdc_host *host = mmc_priv(mmc);
|
|
|
int ret;
|
|
|
- u32 ddr = 0;
|
|
|
|
|
|
pm_runtime_get_sync(host->dev);
|
|
|
|
|
|
- if (ios->timing == MMC_TIMING_UHS_DDR50 ||
|
|
|
- ios->timing == MMC_TIMING_MMC_DDR52)
|
|
|
- ddr = 1;
|
|
|
-
|
|
|
msdc_set_buswidth(host, ios->bus_width);
|
|
|
|
|
|
/* Suspend/Resume will do power off/on */
|
|
|
@@ -1202,8 +1198,8 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if (host->mclk != ios->clock || host->ddr != ddr)
|
|
|
- msdc_set_mclk(host, ddr, ios->clock);
|
|
|
+ if (host->mclk != ios->clock || host->timing != ios->timing)
|
|
|
+ msdc_set_mclk(host, ios->timing, ios->clock);
|
|
|
|
|
|
end:
|
|
|
pm_runtime_mark_last_busy(host->dev);
|