aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2014-09-10 17:52:02 +0200
committerMike Turquette <mturquette@linaro.org>2014-09-10 10:42:02 -0700
commit2fed71e57ae8b44e854a36d33e9a86a94a7628a4 (patch)
treed2bcb34d5dee292c455290b8d3f58b8a89430df0 /drivers/clk
parentclk: fractional-divider: cast parent_rate to u64 before multiplying (diff)
downloadlinux-dev-2fed71e57ae8b44e854a36d33e9a86a94a7628a4.tar.xz
linux-dev-2fed71e57ae8b44e854a36d33e9a86a94a7628a4.zip
clk: rockchip: also protect hclk_peri as critical
The dwc2 usb controller also uses agressive clock gating, which in this case leads to hclk_peri getting disabled and hanging the system. Therefore move it to the critical clocks until we also control that part of the system. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/rockchip/clk-rk3188.c1
-rw-r--r--drivers/clk/rockchip/clk-rk3288.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
index 732118ed55a5..0147614e94b8 100644
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
@@ -602,6 +602,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
static const char *rk3188_critical_clocks[] __initconst = {
"aclk_cpu",
"aclk_peri",
+ "hclk_peri",
};
static void __init rk3188_common_clk_init(struct device_node *np)
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 038b1aaf8c56..08c24c6e3e67 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -683,6 +683,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
static const char *rk3288_critical_clocks[] __initconst = {
"aclk_cpu",
"aclk_peri",
+ "hclk_peri",
};
static void __init rk3288_clk_init(struct device_node *np)