summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorDong Aisheng <aisheng.dong@nxp.com>2016-06-08 22:33:30 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-10 10:26:18 +0200
commit2bf147618a8f9adb80709995a3cd483ff4b2ee54 (patch)
tree08af8378eea0a40cb079fe46cdefbcd21018a01d /drivers/clk
parent433104f880283f881dd139c459533eb538f79ae4 (diff)
clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit
commit b3e76bdc0b2190e67427d31cd740debd01c03631 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk')
-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 6addf8f58b97..cbecbd584624 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -76,9 +76,9 @@ static int clk_pllv3_prepare(struct clk_hw *hw)
val = readl_relaxed(pll->base);
if (pll->powerup_set)
- val |= BM_PLL_POWER;
+ val |= pll->powerdown;
else
- val &= ~BM_PLL_POWER;
+ val &= ~pll->powerdown;
writel_relaxed(val, pll->base);
return clk_pllv3_wait_lock(pll);
@@ -91,9 +91,9 @@ static void clk_pllv3_unprepare(struct clk_hw *hw)
val = readl_relaxed(pll->base);
if (pll->powerup_set)
- val &= ~BM_PLL_POWER;
+ val &= ~pll->powerdown;
else
- val |= BM_PLL_POWER;
+ val |= pll->powerdown;
writel_relaxed(val, pll->base);
}