aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorPeter De Schrijver <pdeschrijver@nvidia.com>2013-06-05 10:21:46 -0400
committerMike Turquette <mturquette@linaro.org>2013-06-11 20:43:51 -0400
commit35d287a9f78dd4d7b080dee2eea3afce73d1bde1 (patch)
treeb58279c6609a34dc4300063c07a9b40e9474a519 /drivers/clk
parentfd428ad87b1f4a12820de07ecb3a155c51c802c7 (diff)
clk: tegra: fix pllre initilization
The PLLRE flags weren't set correctly. Fixed in this patch. Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/tegra/clk-pll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 3b778d3c828e..393b60c9c49d 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -1409,7 +1409,7 @@ struct clk *tegra_clk_register_pllre(const char *name, const char *parent_name,
1409 struct tegra_clk_pll *pll; 1409 struct tegra_clk_pll *pll;
1410 struct clk *clk; 1410 struct clk *clk;
1411 1411
1412 pll_flags |= TEGRA_PLL_HAS_LOCK_ENABLE; 1412 pll_flags |= TEGRA_PLL_HAS_LOCK_ENABLE | TEGRA_PLL_LOCK_MISC;
1413 pll = _tegra_init_pll(clk_base, pmc, fixed_rate, pll_params, pll_flags, 1413 pll = _tegra_init_pll(clk_base, pmc, fixed_rate, pll_params, pll_flags,
1414 freq_table, lock); 1414 freq_table, lock);
1415 if (IS_ERR(pll)) 1415 if (IS_ERR(pll))
@@ -1436,7 +1436,6 @@ struct clk *tegra_clk_register_pllre(const char *name, const char *parent_name,
1436 val &= ~BIT(29); 1436 val &= ~BIT(29);
1437 pll_writel_misc(val, pll); 1437 pll_writel_misc(val, pll);
1438 1438
1439 pll_flags |= TEGRA_PLL_LOCK_MISC;
1440 clk = _tegra_clk_register_pll(pll, name, parent_name, flags, 1439 clk = _tegra_clk_register_pll(pll, name, parent_name, flags,
1441 &tegra_clk_pllre_ops); 1440 &tegra_clk_pllre_ops);
1442 if (IS_ERR(clk)) 1441 if (IS_ERR(clk))