Skip to content

Commit

Permalink
clk: rockchip: Make uartpll a child of the gpll on rk3036
Browse files Browse the repository at this point in the history
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
6a171b2 ("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 <heiko@sntech.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  • Loading branch information
Heiko Stuebner authored and Stephen Boyd committed Mar 7, 2017
1 parent 9b1b23f commit f8ba2d6
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/clk/rockchip/clk-rk3036.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,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__);
Expand Down

0 comments on commit f8ba2d6

Please sign in to comment.