iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit

Browse Source 
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>
This commit is contained in:
Dong Aisheng 2016-06-08 22:33:30 +08:00 committed by Greg Kroah-Hartman
parent 433104f880
commit 2bf147618a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clk/imx/clk-pllv3.c
View File

@ -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);
}