[PATCH 4.2.y-ckt 020/218] clk: rockchip: Add pclk_peri to critical clocks on RK3066/RK3188

From: Kamal Mostafa
Date: Thu Mar 31 2016 - 17:23:37 EST


4.2.8-ckt7 -stable review patch. If anyone has any objections, please let me know.

---8<------------------------------------------------------------

From: Romain Perier <romain.perier@xxxxxxxxx>

commit 3bba75a2ec32bd5fa7024a4de3b8cf9ee113a76a upstream.

Now that the rockchip clock subsystem does clock gating with GPIO banks,
these are no longer enabled once during probe and no longer stay enabled
for eternity. When all these clocks are disabled, the parent clock pclk_peri
might be disabled too, as no other child claims it. So, we need to add pclk_peri
to the critical clocks.

Signed-off-by: Romain Perier <romain.perier@xxxxxxxxx>
Tested-by: Michael Niewoehner <linux@xxxxxxxxxxxxxx>
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Signed-off-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx>
---
drivers/clk/rockchip/clk-rk3188.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
index 1c93229..de08586 100644
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
@@ -709,6 +709,7 @@ static const char *const rk3188_critical_clocks[] __initconst = {
"aclk_peri",
"hclk_peri",
"pclk_cpu",
+ "pclk_peri",
};

static void __init rk3188_common_clk_init(struct device_node *np)
--
2.7.4