diff options
author | Heiko Stübner <heiko@sntech.de> | 2014-09-10 11:52:02 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-09-10 13:42:02 -0400 |
commit | 2fed71e57ae8b44e854a36d33e9a86a94a7628a4 (patch) | |
tree | d2bcb34d5dee292c455290b8d3f58b8a89430df0 | |
parent | feaefa0ea1f1ab3fb92519aef2099ab4d75cce05 (diff) |
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>
-rw-r--r-- | drivers/clk/rockchip/clk-rk3188.c | 1 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk-rk3288.c | 1 |
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 = { | |||
602 | static const char *rk3188_critical_clocks[] __initconst = { | 602 | static const char *rk3188_critical_clocks[] __initconst = { |
603 | "aclk_cpu", | 603 | "aclk_cpu", |
604 | "aclk_peri", | 604 | "aclk_peri", |
605 | "hclk_peri", | ||
605 | }; | 606 | }; |
606 | 607 | ||
607 | static void __init rk3188_common_clk_init(struct device_node *np) | 608 | 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 = { | |||
683 | static const char *rk3288_critical_clocks[] __initconst = { | 683 | static const char *rk3288_critical_clocks[] __initconst = { |
684 | "aclk_cpu", | 684 | "aclk_cpu", |
685 | "aclk_peri", | 685 | "aclk_peri", |
686 | "hclk_peri", | ||
686 | }; | 687 | }; |
687 | 688 | ||
688 | static void __init rk3288_clk_init(struct device_node *np) | 689 | static void __init rk3288_clk_init(struct device_node *np) |