This is a note to let you know that I've just added the patch titled
clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
clk-imx-clk-pllv3-fix-incorrect-handle-of-enet-powerdown-bit.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b3e76bdc0b2190e67427d31cd740debd01c03631 Mon Sep 17 00:00:00 2001
From: Dong Aisheng <aisheng.dong@xxxxxxx>
Date: Wed, 8 Jun 2016 22:33:30 +0800
Subject: clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit
From: Dong Aisheng <aisheng.dong@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Shawn Guo <shawnguo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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);
}
Patches currently in stable-queue which might be from aisheng.dong@xxxxxxx are
queue-4.4/clk-imx-clk-pllv3-fix-incorrect-handle-of-enet-powerdown-bit.patch
