aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong Aisheng <aisheng.dong@nxp.com>2016-06-08 10:33:30 -0400
committerShawn Guo <shawnguo@kernel.org>2016-06-12 22:53:32 -0400
commitb3e76bdc0b2190e67427d31cd740debd01c03631 (patch)
tree22137cbe214b5a8e32f76591fe4231fbb50ee43b
parentf83d31635cd65dd10eddaac1809b9e400d385d43 (diff)
clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit
After commit f53947456f98 ("ARM: clk: imx: update pllv3 to support imx7"), the former used BM_PLL_POWER bit is not correct anymore for IMX7 ENET. Instead, pll->powerdown holds the correct bit, so using powerdown bit in clk_pllv3_{prepare | unprepare} functions. Fixes: f53947456f98 ("ARM: clk: imx: update pllv3 to support imx7") Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--drivers/clk/imx/clk-pllv3.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index 2afc677979a3..eea2b1b3791e 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -77,9 +77,9 @@ static int clk_pllv3_prepare(struct clk_hw *hw)
77 77
78 val = readl_relaxed(pll->base); 78 val = readl_relaxed(pll->base);
79 if (pll->powerup_set) 79 if (pll->powerup_set)
80 val |= BM_PLL_POWER; 80 val |= pll->powerdown;
81 else 81 else
82 val &= ~BM_PLL_POWER; 82 val &= ~pll->powerdown;
83 writel_relaxed(val, pll->base); 83 writel_relaxed(val, pll->base);
84 84
85 return clk_pllv3_wait_lock(pll); 85 return clk_pllv3_wait_lock(pll);
@@ -92,9 +92,9 @@ static void clk_pllv3_unprepare(struct clk_hw *hw)
92 92
93 val = readl_relaxed(pll->base); 93 val = readl_relaxed(pll->base);
94 if (pll->powerup_set) 94 if (pll->powerup_set)
95 val &= ~BM_PLL_POWER; 95 val &= ~pll->powerdown;
96 else 96 else
97 val |= BM_PLL_POWER; 97 val |= pll->powerdown;
98 writel_relaxed(val, pll->base); 98 writel_relaxed(val, pll->base);
99} 99}
100 100