OSDN Git Service

clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks
authorJustin Swartz <justin.swartz@risingedge.co.za>
Tue, 14 Jan 2020 16:25:02 +0000 (16:25 +0000)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 13 Apr 2020 07:35:24 +0000 (09:35 +0200)
commitcec9d101d70a3509da9bd2e601e0b242154ce616
tree199d567d19b35661e24602df14efbfe3ff7f776d
parent8f3d9f354286745c751374f5f1fcafee6b3f3136
clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks

The following changes prevent the unrecoverable freezes and rcu_sched
stall warnings experienced in each of my attempts to take advantage of
lima.

Replace the COMPOSITE_NOGATE definition of aclk_gpu_pre with a
COMPOSITE that retains the selection of HDMIPHY as the PLL source, but
instead makes uses of the aclk_gpu PLL source gate and parent names
defined by mux_pll_src_4plls_p rather than mux_aclk_gpu_pre_p.

Remove the now unused mux_aclk_gpu_pre_p and the four named but also
unused definitions (cpll_gpu, gpll_gpu, hdmiphy_gpu and usb480m_gpu)
of the aclk_gpu PLL source gate.

Use the correct gate offset for aclk_gpu and aclk_gpu_noc.

Fixes: 307a2e9ac524 ("clk: rockchip: add clock controller for rk3228")
Cc: stable@vger.kernel.org
Signed-off-by: Justin Swartz <justin.swartz@risingedge.co.za>
[double-checked against SoC manual and added fixes tag]
Link: https://lore.kernel.org/r/20200114162503.7548-1-justin.swartz@risingedge.co.za
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
drivers/clk/rockchip/clk-rk3228.c