lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 01/37] clk: rockchip: rk3036: fix up the sclk_sfc parent error
    Date
    From: Jon Lin <jon.lin@rock-chips.com>

    [ Upstream commit 0be3df186f870cbde56b223c1ad7892109c9c440 ]

    Choose the correct pll

    Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
    Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
    Acked-by: Stephen Boyd <sboyd@kernel.org>
    Link: https://lore.kernel.org/r/20210713094456.23288-5-jon.lin@rock-chips.com
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/rockchip/clk-rk3036.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c
    index 6a46f85ad837..1814be5ef574 100644
    --- a/drivers/clk/rockchip/clk-rk3036.c
    +++ b/drivers/clk/rockchip/clk-rk3036.c
    @@ -120,6 +120,7 @@ PNAME(mux_pll_src_3plls_p) = { "apll", "dpll", "gpll" };
    PNAME(mux_timer_p) = { "xin24m", "pclk_peri_src" };

    PNAME(mux_pll_src_apll_dpll_gpll_usb480m_p) = { "apll", "dpll", "gpll", "usb480m" };
    +PNAME(mux_pll_src_dmyapll_dpll_gpll_xin24_p) = { "dummy_apll", "dpll", "gpll", "xin24m" };

    PNAME(mux_mmc_src_p) = { "apll", "dpll", "gpll", "xin24m" };
    PNAME(mux_i2s_pre_p) = { "i2s_src", "i2s_frac", "ext_i2s", "xin12m" };
    @@ -339,7 +340,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
    RK2928_CLKSEL_CON(16), 8, 2, MFLAGS, 10, 5, DFLAGS,
    RK2928_CLKGATE_CON(10), 4, GFLAGS),

    - COMPOSITE(SCLK_SFC, "sclk_sfc", mux_pll_src_apll_dpll_gpll_usb480m_p, 0,
    + COMPOSITE(SCLK_SFC, "sclk_sfc", mux_pll_src_dmyapll_dpll_gpll_xin24_p, 0,
    RK2928_CLKSEL_CON(16), 0, 2, MFLAGS, 2, 5, DFLAGS,
    RK2928_CLKGATE_CON(10), 5, GFLAGS),

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-10 03:00    [W:9.472 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site