From: Mike Turquette <mturquette@linaro.org>
Date: Thu, 25 Sep 2014 22:48:04 +0000 (-0700)
Subject: Merge branch 'clk-next-rockchip' into clk-next
X-Git-Tag: firefly_0821_release~176^2~3030^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa531042ac3633b726067253f48ac542d86b80ad;p=firefly-linux-kernel-4.4.55.git

Merge branch 'clk-next-rockchip' into clk-next
---

fa531042ac3633b726067253f48ac542d86b80ad
diff --cc drivers/clk/rockchip/clk-rk3288.c
index aa4f4b7a6918,35c3297d05ba..21a5c74f1bec
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@@ -716,10 -730,8 +736,10 @@@ static void __init rk3288_clk_init(stru
  				   RK3288_GRF_SOC_STATUS);
  	rockchip_clk_register_branches(rk3288_clk_branches,
  				  ARRAY_SIZE(rk3288_clk_branches));
 +	rockchip_clk_protect_critical(rk3288_critical_clocks,
 +				      ARRAY_SIZE(rk3288_critical_clocks));
  
- 	rockchip_register_softrst(np, 9, reg_base + RK3288_SOFTRST_CON(0),
+ 	rockchip_register_softrst(np, 12, reg_base + RK3288_SOFTRST_CON(0),
  				  ROCKCHIP_SOFTRST_HIWORD_MASK);
  }
  CLK_OF_DECLARE(rk3288_cru, "rockchip,rk3288-cru", rk3288_clk_init);