The clock rate set to the sdh controller may not exactly as requested by the mmc core, this patch make the clock rate saved in the mmc_ios and sdhci_host updated with the actual setting as in the controller. Thus "/sys/kernel/debug/mmcx/ios" and card detect prints can show the correct clock rate. Otherwise, mmc power class may be set to wrong value with wrong ios.clock Signed-off-by: Bin Wang <binw@xxxxxxxxxxx> Signed-off-by: Kevin Liu <kliu5@xxxxxxxxxxx> --- drivers/mmc/host/sdhci.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6699497..7084a1c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1239,7 +1239,10 @@ preset: sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); out: - host->clock = clock; + if (real_div) + host->clock = host->mmc->actual_clock; + else + host->clock = clock; } static int sdhci_set_power(struct sdhci_host *host, unsigned short power) @@ -1422,6 +1425,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) sdhci_enable_preset_value(host, false); sdhci_set_clock(host, ios->clock); + ios->clock = host->clock; if (ios->power_mode == MMC_POWER_OFF) vdd_bit = sdhci_set_power(host, -1); -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
