| Message ID | 1470045224-31854-5-git-send-email-zhengxing@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 01, 2016 at 05:53:39PM +0800, Xing Zheng wrote: > Sorry to refer incorrect clock diagram, we double check it that the > bits configuration of the Xpll_aclk_perihp_src need to be fixed: > bit 1 - shows aclk_perihp_cpll_src_en > bit 0 - shows aclk_perihp_gpll_src_en Last time, you confirmed with the IC designers that we had things right. What's different this time? Have you, for instance, done more thorough testing, to show that the logical parent structure this driver outputs is actually what the hardware is doing? I think maybe this would qualify as: Fixes: 3bd14ae9da91 ("clk: rockchip: fix incorrect parent for rk3399's {c,g}pll_aclk_perihp_src") The above is not exactly a pure regression (we really want both changes), but apparently it wasn't a complete fix. > Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> > --- > > Changes in v2: None Uhh, isn't this patch brand new in v2? I don't think that means "Changes ... None". Brian > drivers/clk/rockchip/clk-rk3399.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c > index 2182391..8bf0d19 100644 > --- a/drivers/clk/rockchip/clk-rk3399.c > +++ b/drivers/clk/rockchip/clk-rk3399.c > @@ -833,9 +833,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { > > /* perihp */ > GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, > - RK3399_CLKGATE_CON(5), 0, GFLAGS), > - GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, > RK3399_CLKGATE_CON(5), 1, GFLAGS), > + GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, > + RK3399_CLKGATE_CON(5), 0, GFLAGS), > COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p, CLK_IGNORE_UNUSED, > RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5, DFLAGS, > RK3399_CLKGATE_CON(5), 2, GFLAGS), > -- > 1.7.9.5 > >
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 2182391..8bf0d19 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -833,9 +833,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { /* perihp */ GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, - RK3399_CLKGATE_CON(5), 0, GFLAGS), - GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(5), 1, GFLAGS), + GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, + RK3399_CLKGATE_CON(5), 0, GFLAGS), COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p, CLK_IGNORE_UNUSED, RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(5), 2, GFLAGS),
Sorry to refer incorrect clock diagram, we double check it that the bits configuration of the Xpll_aclk_perihp_src need to be fixed: bit 1 - shows aclk_perihp_cpll_src_en bit 0 - shows aclk_perihp_gpll_src_en Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> --- Changes in v2: None drivers/clk/rockchip/clk-rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)