aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorBrian Norris <briannorris@chromium.org>2016-05-13 11:42:16 -0700
committerHeiko Stuebner <heiko@sntech.de>2016-05-30 09:40:23 +0200
commit176df69cb080c8cd813e51f800069e13ee607641 (patch)
treed0a2315258d5dd561db5a8d104b010a8c023dcf6 /drivers/clk
parentclk: rockchip: initialize flags of clk_init_data in mmc-phase clock (diff)
downloadlinux-dev-176df69cb080c8cd813e51f800069e13ee607641.tar.xz
linux-dev-176df69cb080c8cd813e51f800069e13ee607641.zip
clk: rockchip: mark rk3399 GIC clocks as critical
We never want to kill the GIC. Noticed when making other clock fixups, and seeing the newly-constructed clock tree try to disable cpll, where we had this parent structure: aclk_gic <------\ |--- aclk_gic_pre <-- cpll <-- pll_cpll aclk_gic_noc <--/ Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/rockchip/clk-rk3399.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 291543f52caa..145756c4f3c8 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -1466,6 +1466,8 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = {
static const char *const rk3399_cru_critical_clocks[] __initconst = {
"aclk_cci_pre",
+ "aclk_gic",
+ "aclk_gic_noc",
"pclk_perilp0",
"pclk_perilp0",
"hclk_perilp0",