From: Heiko Stuebner Date: Wed, 1 Mar 2017 21:00:42 +0000 (+0100) Subject: UPSTREAM: clk: rockchip: Make uartpll a child of the gpll on rk3036 X-Git-Tag: release-20171130_firefly~4^2~452 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6e7fcae9814bc0c35ca71cd2ea31a27a33bac74;p=firefly-linux-kernel-4.4.55.git UPSTREAM: clk: rockchip: Make uartpll a child of the gpll on rk3036 The shared uart-pll is on boot a child of the apll that can get changed by cpu frequency scaling. So move it away to the more stable gpll to make sure the uart doesn't break on cpu frequency changes. This turned up during the 4.11 merge-window when commit 6a171b299379 ("serial: 8250_dw: Allow hardware flow control to be used") added general termios enablement making the uart on rk3036 change frequency and thus making it susceptible for the frequency scaling issue. Signed-off-by: Heiko Stuebner Signed-off-by: Stephen Boyd (cherry picked from git.kernel.org mmind/linux-rockchip.git v4.13-clk/next commit f8ba2d68e54fbca340ad0fce97397291ba9637bc) Change-Id: Ia8683d7b49523284043457727665d7e58d1551ec Signed-off-by: Elaine Zhang --- diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c index 6cdb0a24c066..9ee3ac142d98 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -446,6 +446,13 @@ static void __init rk3036_clk_init(struct device_node *np) return; } + /* + * Make uart_pll_clk a child of the gpll, as all other sources are + * not that usable / stable. + */ + writel_relaxed(HIWORD_UPDATE(0x2, 0x3, 10), + reg_base + RK2928_CLKSEL_CON(13)); + ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); if (IS_ERR(ctx)) { pr_err("%s: rockchip clk init failed\n", __func__);