Commit ce0a9d09 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'v5.7-rockchip-clk-fixes1' of... 

Merge tag 'v5.7-rockchip-clk-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-fixes

Pull one Rockchip clk fix from Heiko Stuebner:

 - Fix for wrongly defines rk3228 aclk_gpu*

* tag 'v5.7-rockchip-clk-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks
parents 4d3d6417 cec9d101

drivers/clk/rockchip/clk-rk3228.c

+4 −13
Original line number Diff line number Diff line
@@ -156,8 +156,6 @@ PNAME(mux_i2s_out_p) = { "i2s1_pre", "xin12m" }; 
PNAME(mux_i2s2_p)		= { "i2s2_src", "i2s2_frac", "xin12m" };

PNAME(mux_sclk_spdif_p)		= { "sclk_spdif_src", "spdif_frac", "xin12m" };



PNAME(mux_aclk_gpu_pre_p)	= { "cpll_gpu", "gpll_gpu", "hdmiphy_gpu", "usb480m_gpu" };



PNAME(mux_uart0_p)		= { "uart0_src", "uart0_frac", "xin24m" };

PNAME(mux_uart1_p)		= { "uart1_src", "uart1_frac", "xin24m" };

PNAME(mux_uart2_p)		= { "uart2_src", "uart2_frac", "xin24m" };
@@ -468,16 +466,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { 
			RK2928_CLKSEL_CON(24), 6, 10, DFLAGS,

			RK2928_CLKGATE_CON(2), 8, GFLAGS),



	GATE(0, "cpll_gpu", "cpll", 0,

			RK2928_CLKGATE_CON(3), 13, GFLAGS),

	GATE(0, "gpll_gpu", "gpll", 0,

			RK2928_CLKGATE_CON(3), 13, GFLAGS),

	GATE(0, "hdmiphy_gpu", "hdmiphy", 0,

			RK2928_CLKGATE_CON(3), 13, GFLAGS),

	GATE(0, "usb480m_gpu", "usb480m", 0,

	COMPOSITE(0, "aclk_gpu_pre", mux_pll_src_4plls_p, 0,

			RK2928_CLKSEL_CON(34), 5, 2, MFLAGS, 0, 5, DFLAGS,

			RK2928_CLKGATE_CON(3), 13, GFLAGS),

	COMPOSITE_NOGATE(0, "aclk_gpu_pre", mux_aclk_gpu_pre_p, 0,

			RK2928_CLKSEL_CON(34), 5, 2, MFLAGS, 0, 5, DFLAGS),



	COMPOSITE(SCLK_SPI0, "sclk_spi0", mux_pll_src_2plls_p, 0,

			RK2928_CLKSEL_CON(25), 8, 1, MFLAGS, 0, 7, DFLAGS,
@@ -582,8 +573,8 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { 
	GATE(0, "pclk_peri_noc", "pclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(12), 2, GFLAGS),



	/* PD_GPU */

	GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(13), 14, GFLAGS),

	GATE(0, "aclk_gpu_noc", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(13), 15, GFLAGS),

	GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(7), 14, GFLAGS),

	GATE(0, "aclk_gpu_noc", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(7), 15, GFLAGS),



	/* PD_BUS */

	GATE(0, "sclk_initmem_mbist", "aclk_cpu", 0, RK2928_CLKGATE_CON(8), 1, GFLAGS),

CRA Git | Maintained and supported by SUSTech CRA and CCSE