Quoting Mark yao (2014-09-12 02:24:46) > The rk3288 actually has 12 softresets, so fix the register count. > > Signed-off-by: Mark yao <mark....@rock-chips.com>
Applied to clk-next. Regards, Mike > --- > drivers/clk/rockchip/clk-rk3288.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/rockchip/clk-rk3288.c > b/drivers/clk/rockchip/clk-rk3288.c > index 0d8c6c5..2e1d790 100644 > --- a/drivers/clk/rockchip/clk-rk3288.c > +++ b/drivers/clk/rockchip/clk-rk3288.c > @@ -711,7 +711,7 @@ static void __init rk3288_clk_init(struct device_node *np) > rockchip_clk_register_branches(rk3288_clk_branches, > ARRAY_SIZE(rk3288_clk_branches)); > > - 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); > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
