lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 206/312] clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit
    Date
    From: Dong Aisheng <aisheng.dong@nxp.com>

    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>

    ---
    drivers/clk/imx/clk-pllv3.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- 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_

    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 c

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


    \
     
     \ /
      Last update: 2020-05-08 14:45    [W:4.246 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site