From 8b7e7a27247faf6d71cdee140ed8eefa0f1422d4 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 27 Feb 2017 22:55:02 +0100 Subject: [PATCH 4/4] ARM: dts: rockchip: Make uartpll a child of the gpll on rk3036 The shared uart-pll is normally 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 --- arch/arm/boot/dts/rk3036.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index ff9b90bfaefd..6442023854c5 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -310,8 +310,9 @@ rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>; - assigned-clocks = <&cru PLL_GPLL>; - assigned-clock-rates = <594000000>; + assigned-clocks = <&cru PLL_GPLL>, <&cru SCLK_UARTPLL>; + assigned-clock-rates = <594000000>, <0>; + assigned-clock-parents = <0>, <&cru PLL_GPLL>; }; grf: syscon@20008000 { -- 2.11.0