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

diff --cc drivers/clk/rockchip/clk-rk3288.c
index aa4f4b7a6918d32185a3f219cce5ee814fa0c5eb,35c3297d05bac6f7103e0ed6986f0daba9022e78..21a5c74f1bec6c8dee04b3cc50706a51e23b9e63
--- 1/drivers/clk/rockchip/clk-rk3288.c
--- 2/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);