diff options
| author | Pavan Kunapuli <pkunapuli@nvidia.com> | 2014-03-28 17:13:24 +0530 |
|---|---|---|
| committer | Pavan Kunapuli <pkunapuli@nvidia.com> | 2014-04-14 03:54:55 -0700 |
| commit | 720c60aef1859b9c0d913c131203e02e6af4c3e6 (patch) | |
| tree | 4e4f0527d082cd416ab9a60f5401109f217d8c1b /drivers/mmc | |
| parent | 73687a8eb4734170f7451f08dcf865bd5b494a8a (diff) | |
mmc: tegra: Fix parent clk configuration
Do not ignore parent clk setting and parent clock source flag
update for any case. For eMMC, in resume, without pll_c as clk
source, 200MHz cannot be set in HS200 mode set.
Bug 1480583
Reviewed-on: http://git-master/r/389704
(cherry picked from commit b9b0cb1541d66ba2450a680666c3fe962b4f71df)
Change-Id: I7898a57871cd16de49142a6534a998bef0c43529
Signed-off-by: Pavan Kunapuli <pkunapuli@nvidia.com>
Reviewed-on: http://git-master/r/395205
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index dd37c6bd7650..979e502dbd38 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -1337,13 +1337,12 @@ static void tegra_sdhci_clock_set_parent(struct sdhci_host *host, if ((pll_c_freq > desired_rate) && (pll_p_freq > desired_rate)) { if (pll_p_freq <= pll_c_freq) { desired_rate = pll_p_freq; - parent_clk = pll_p; + pll_c_freq = 0; } else { desired_rate = pll_c_freq; - parent_clk = pll_c; + pll_p_freq = 0; } rc = clk_set_rate(pltfm_host->clk, desired_rate); - goto set_clk_parent; } if (pll_c_freq > pll_p_freq) { @@ -1359,7 +1358,6 @@ static void tegra_sdhci_clock_set_parent(struct sdhci_host *host, } else return; -set_clk_parent: rc = clk_set_parent(pltfm_host->clk, parent_clk); if (rc) pr_err("%s: failed to set pll parent clock %d\n", |