clk: tegra: Fix enabling of PLLE
authorThierry Reding <treding@nvidia.com>
Fri, 4 Apr 2014 13:55:15 +0000 (15:55 +0200)
committerPeter De Schrijver <pdeschrijver@nvidia.com>
Thu, 17 Apr 2014 11:12:46 +0000 (14:12 +0300)
When enabling the PLLE as its final step, clk_plle_enable() would
accidentally OR in the value previously written to the PLLE_SS_CTRL
register.

Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/clk/tegra/clk-pll.c

index 1187187a1cf2dea31c2798162036d746e52fb424..7a1b70dac824ff21de8db50b8bdf4300e9110a50 100644 (file)
@@ -757,7 +757,7 @@ static int clk_plle_enable(struct clk_hw *hw)
        val |= PLLE_SS_DISABLE;
        writel(val, pll->clk_base + PLLE_SS_CTRL);
 
-       val |= pll_readl_base(pll);
+       val = pll_readl_base(pll);
        val |= (PLL_BASE_BYPASS | PLL_BASE_ENABLE);
        pll_writel_base(val, pll);