]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
clk: tegra: fix pllre initilization
authorPeter De Schrijver <pdeschrijver@nvidia.com>
Wed, 5 Jun 2013 14:21:46 +0000 (17:21 +0300)
committerMike Turquette <mturquette@linaro.org>
Wed, 12 Jun 2013 00:43:51 +0000 (17:43 -0700)
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>
drivers/clk/tegra/clk-pll.c

index 3b778d3c828e78e91cd6a70a8b0823aee21b8537..393b60c9c49d59d911a663871da57c1b3de7f1bc 100644 (file)
@@ -1409,7 +1409,7 @@ struct clk *tegra_clk_register_pllre(const char *name, const char *parent_name,
        struct tegra_clk_pll *pll;
        struct clk *clk;
 
-       pll_flags |= TEGRA_PLL_HAS_LOCK_ENABLE;
+       pll_flags |= TEGRA_PLL_HAS_LOCK_ENABLE | TEGRA_PLL_LOCK_MISC;
        pll = _tegra_init_pll(clk_base, pmc, fixed_rate, pll_params, pll_flags,
                              freq_table, lock);
        if (IS_ERR(pll))
@@ -1436,7 +1436,6 @@ struct clk *tegra_clk_register_pllre(const char *name, const char *parent_name,
        val &= ~BIT(29);
        pll_writel_misc(val, pll);
 
-       pll_flags |= TEGRA_PLL_LOCK_MISC;
        clk = _tegra_clk_register_pll(pll, name, parent_name, flags,
                                      &tegra_clk_pllre_ops);
        if (IS_ERR(clk))