| Message ID | 1465396420-27064-1-git-send-email-aisheng.dong@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Shawn, On Wed, Jun 8, 2016 at 10:33 PM, Dong Aisheng <aisheng.dong@nxp.com> wrote: > 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> Any comments about this one? Regards Dong Aisheng > --- > drivers/clk/imx/clk-pllv3.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c > index 4826b3c9e19e..44d294a336f0 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) > > 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); > @@ -92,9 +92,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); > } > > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Sun, Jun 12, 2016 at 10:56:38PM +0800, Dong Aisheng wrote: > Hi Shawn, > > On Wed, Jun 8, 2016 at 10:33 PM, Dong Aisheng <aisheng.dong@nxp.com> wrote: > > 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> > > Any comments about this one? Sorry. I thought I had applied it. Applied it now, thanks. Shawn
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index 4826b3c9e19e..44d294a336f0 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) 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); @@ -92,9 +92,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); }
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> --- drivers/clk/imx/clk-pllv3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)