openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: sunxi: Gate the clock when rate is 0 

The MMC core assumes that the code will gate the clock when the bus
frequency is set to 0, which we've been ignoring so far.

Handle that.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Florian Vaussard <florian.vaussard@heig-vd.ch>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Maxime Ripard 2017-01-27 22:38:34 +01:00 committed by Ulf Hansson
parent 39cc281fb7
commit 9479074e93
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/host/sunxi-mmc.c
View File

@ -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 */
} }