|
@@ -765,6 +765,9 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
|
|
+ if (!ios->clock)
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
/* 8 bit DDR requires a higher module clock */
|
|
/* 8 bit DDR requires a higher module clock */
|
|
if (ios->timing == MMC_TIMING_MMC_DDR52 &&
|
|
if (ios->timing == MMC_TIMING_MMC_DDR52 &&
|
|
ios->bus_width == MMC_BUS_WIDTH_8)
|
|
ios->bus_width == MMC_BUS_WIDTH_8)
|
|
@@ -882,7 +885,7 @@ static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|
mmc_writel(host, REG_GCTRL, rval);
|
|
mmc_writel(host, REG_GCTRL, rval);
|
|
|
|
|
|
/* set up clock */
|
|
/* set up clock */
|
|
- if (ios->clock && ios->power_mode) {
|
|
|
|
|
|
+ if (ios->power_mode) {
|
|
host->ferror = sunxi_mmc_clk_set_rate(host, ios);
|
|
host->ferror = sunxi_mmc_clk_set_rate(host, ios);
|
|
/* Android code had a usleep_range(50000, 55000); here */
|
|
/* Android code had a usleep_range(50000, 55000); here */
|
|
}
|
|
}
|