clk: rockchip: also protect hclk_peri as critical

Commit Message

Heiko Stuebner Sept. 10, 2014, 3:52 p.m. UTC

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 <[e-mail]>
---
 drivers/clk/rockchip/clk-rk3188.c | 1 +
 drivers/clk/rockchip/clk-rk3288.c | 1 +
 2 files changed, 2 insertions(+)

Comments

Mike Turquette Sept. 10, 2014, 5:42 p.m. UTC | #1

Quoting Heiko Stübner (2014-09-10 08:52:02)
> 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 <[e-mail]>

Applied to clk-next.

Regards,
Mike

> ---
>  drivers/clk/rockchip/clk-rk3188.c | 1 +
>  drivers/clk/rockchip/clk-rk3288.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
> index 1892c66..9f9937e 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 43e0ad0..c76b16d 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)
> -- 
> 2.0.1
> 
>

Patch

diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
index 1892c66..9f9937e 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 43e0ad0..c76b16d 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)