[RESEND PATCH v2 3/8] clk: rockchip: rk3399: fix incorrect parent for rk3399's {c, g}pll_aclk_perihp_src
From: Xing Zheng <hidden>
Date: 2016-08-02 01:58:19
Also in:
linux-clk, linux-rockchip, lkml
Hi Brain, On 2016?08?02? 04:13, Brian Norris wrote:
On Mon, Aug 01, 2016 at 05:53:38PM +0800, Xing Zheng wrote:quoted
There was a typo, swapping 'c' <--> 'g'. (This patch is updated and am from https://patchwork.kernel.org/patch/9254067/) Signed-off-by: Xing Zheng <redacted> Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> --- Changes in v2: NoneI believe this patch was already applied upstream; otherwise, it wouldn't make sense to have both this patch and patch 4 -- we would probably squash them together. Brian
Yes, this patch is applied in mmind/linux-rockchip.git v4.7-clk/fixes, I arm sorry to tracked on v4.8-clk/next so that didn't note it. This patch will be abandoned. Thanks.
quoted
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 f55f967f..2182391 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c@@ -832,9 +832,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(13), 1, GFLAGS), /* perihp */ - GATE(0, "cpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, + GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(5), 0, GFLAGS), - GATE(0, "gpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, + GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(5), 1, GFLAGS), COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p, CLK_IGNORE_UNUSED, RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5, DFLAGS,-- 1.7.9.5
-- - Xing Zheng