]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mmc: sdhci-of-arasan: fix set_clock when a phy is supported
authorShawn Lin <shawn.lin@rock-chips.com>
Wed, 4 May 2016 01:43:24 +0000 (09:43 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 4 May 2016 11:12:36 +0000 (13:12 +0200)
commit 61b914eb81f8 ("mmc: sdhci-of-arasan: add phy support for
sdhci-of-arasan") introduce phy support for arasan. According to
the vendor's databook, we should make sure the phy is in poweroff
status before we configure the clk stuff. Otherwise it may cause
some IO sample timing issues from the test. And we don't need this
extra operation while running in low performance mode since phy
doesn't trigger sampling block.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-of-arasan.c

index 2e482b13d25e0ce0ebafde3433141236739f7943..b6f4c1d4163624ac5e38dc2caa3e525b8d83d011 100644 (file)
@@ -55,8 +55,32 @@ static unsigned int sdhci_arasan_get_timeout_clock(struct sdhci_host *host)
        return freq;
 }
 
+static void sdhci_arasan_set_clock(struct sdhci_host *host, unsigned int clock)
+{
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
+       bool ctrl_phy = false;
+
+       if (clock > MMC_HIGH_52_MAX_DTR && (!IS_ERR(sdhci_arasan->phy)))
+               ctrl_phy = true;
+
+       if (ctrl_phy) {
+               spin_unlock_irq(&host->lock);
+               phy_power_off(sdhci_arasan->phy);
+               spin_lock_irq(&host->lock);
+       }
+
+       sdhci_set_clock(host, clock);
+
+       if (ctrl_phy) {
+               spin_unlock_irq(&host->lock);
+               phy_power_on(sdhci_arasan->phy);
+               spin_lock_irq(&host->lock);
+       }
+}
+
 static struct sdhci_ops sdhci_arasan_ops = {
-       .set_clock = sdhci_set_clock,
+       .set_clock = sdhci_arasan_set_clock,
        .get_max_clock = sdhci_pltfm_clk_get_max_clock,
        .get_timeout_clock = sdhci_arasan_get_timeout_clock,
        .set_bus_width = sdhci_set_bus_width,