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

Merge tag 'v5.11-rockchip-clk-1' of... 

Merge tag 'v5.11-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip

Pull Rockchip clk driver updates from Heiko Stuebner:

Added arch-dependencies for the newly added per-soc config symbols,
an unneeded redundancy removed and making i2s actually work on the
rk3066.

* tag 'v5.11-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: fix i2s gate bits on rk3066 and rk3188
  clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
  clk: rockchip: Remove redundant null check before clk_prepare_enable
  clk: rockchip: Add appropriate arch dependencies
parents 3650b228 caa2fd75

drivers/clk/rockchip/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -11,67 +11,77 @@ config COMMON_CLK_ROCKCHIP 
if COMMON_CLK_ROCKCHIP

config CLK_PX30

	bool "Rockchip PX30 clock controller support"

	depends on (ARM64 || COMPILE_TEST)

	default y

	help

	  Build the driver for PX30 Clock Driver.



config CLK_RV110X

	bool "Rockchip RV110x clock controller support"

	depends on (ARM || COMPILE_TEST)

	default y

	help

	  Build the driver for RV110x Clock Driver.



config CLK_RK3036

	bool "Rockchip RK3036 clock controller support"

	depends on (ARM || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3036 Clock Driver.



config CLK_RK312X

	bool "Rockchip RK312x clock controller support"

	depends on (ARM || COMPILE_TEST)

	default y

	help

	  Build the driver for RK312x Clock Driver.



config CLK_RK3188

	bool "Rockchip RK3188 clock controller support"

	depends on (ARM || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3188 Clock Driver.



config CLK_RK322X

	bool "Rockchip RK322x clock controller support"

	depends on (ARM || COMPILE_TEST)

	default y

	help

	  Build the driver for RK322x Clock Driver.



config CLK_RK3288

	bool "Rockchip RK3288 clock controller support"

	depends on ARM

	depends on (ARM || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3288 Clock Driver.



config CLK_RK3308

	bool "Rockchip RK3308 clock controller support"

	depends on (ARM64 || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3308 Clock Driver.



config CLK_RK3328

	bool "Rockchip RK3328 clock controller support"

	depends on (ARM64 || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3328 Clock Driver.



config CLK_RK3368

	bool "Rockchip RK3368 clock controller support"

	depends on (ARM64 || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3368 Clock Driver.



config CLK_RK3399

	tristate "Rockchip RK3399 clock controller support"

	depends on (ARM64 || COMPILE_TEST)

	default y

	help

	  Build the driver for RK3399 Clock Driver.

drivers/clk/rockchip/clk-rk3188.c

+18 −17
Original line number Diff line number Diff line
@@ -255,19 +255,19 @@ static struct rockchip_clk_branch common_spdif_fracmux __initdata = 
			RK2928_CLKSEL_CON(5), 8, 2, MFLAGS);



static struct rockchip_clk_branch common_uart0_fracmux __initdata =

	MUX(SCLK_UART0, "sclk_uart0", mux_sclk_uart0_p, 0,

	MUX(SCLK_UART0, "sclk_uart0", mux_sclk_uart0_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(13), 8, 2, MFLAGS);



static struct rockchip_clk_branch common_uart1_fracmux __initdata =

	MUX(SCLK_UART1, "sclk_uart1", mux_sclk_uart1_p, 0,

	MUX(SCLK_UART1, "sclk_uart1", mux_sclk_uart1_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(14), 8, 2, MFLAGS);



static struct rockchip_clk_branch common_uart2_fracmux __initdata =

	MUX(SCLK_UART2, "sclk_uart2", mux_sclk_uart2_p, 0,

	MUX(SCLK_UART2, "sclk_uart2", mux_sclk_uart2_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(15), 8, 2, MFLAGS);



static struct rockchip_clk_branch common_uart3_fracmux __initdata =

	MUX(SCLK_UART3, "sclk_uart3", mux_sclk_uart3_p, 0,

	MUX(SCLK_UART3, "sclk_uart3", mux_sclk_uart3_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(16), 8, 2, MFLAGS);



static struct rockchip_clk_branch common_clk_branches[] __initdata = {
@@ -408,28 +408,28 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { 
	COMPOSITE_NOMUX(0, "uart0_pre", "uart_src", 0,

			RK2928_CLKSEL_CON(13), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(1), 8, GFLAGS),

	COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_pre", 0,

	COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(17), 0,

			RK2928_CLKGATE_CON(1), 9, GFLAGS,

			&common_uart0_fracmux),

	COMPOSITE_NOMUX(0, "uart1_pre", "uart_src", 0,

			RK2928_CLKSEL_CON(14), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(1), 10, GFLAGS),

	COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_pre", 0,

	COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(18), 0,

			RK2928_CLKGATE_CON(1), 11, GFLAGS,

			&common_uart1_fracmux),

	COMPOSITE_NOMUX(0, "uart2_pre", "uart_src", 0,

			RK2928_CLKSEL_CON(15), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(1), 12, GFLAGS),

	COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_pre", 0,

	COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(19), 0,

			RK2928_CLKGATE_CON(1), 13, GFLAGS,

			&common_uart2_fracmux),

	COMPOSITE_NOMUX(0, "uart3_pre", "uart_src", 0,

			RK2928_CLKSEL_CON(16), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(1), 14, GFLAGS),

	COMPOSITE_FRACMUX(0, "uart3_frac", "uart3_pre", 0,

	COMPOSITE_FRACMUX(0, "uart3_frac", "uart3_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(20), 0,

			RK2928_CLKGATE_CON(1), 15, GFLAGS,

			&common_uart3_fracmux),
@@ -449,7 +449,6 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { 


	/* hclk_cpu gates */

	GATE(HCLK_ROM, "hclk_rom", "hclk_cpu", 0, RK2928_CLKGATE_CON(5), 6, GFLAGS),

	GATE(HCLK_I2S0, "hclk_i2s0", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS),

	GATE(HCLK_SPDIF, "hclk_spdif", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 1, GFLAGS),

	GATE(0, "hclk_cpubus", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 8, GFLAGS),

	/* hclk_ahb2apb is part of a clk branch */
@@ -543,15 +542,15 @@ static struct clk_div_table div_aclk_cpu_t[] = { 
};



static struct rockchip_clk_branch rk3066a_i2s0_fracmux __initdata =

	MUX(SCLK_I2S0, "sclk_i2s0", mux_sclk_i2s0_p, 0,

	MUX(SCLK_I2S0, "sclk_i2s0", mux_sclk_i2s0_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(2), 8, 2, MFLAGS);



static struct rockchip_clk_branch rk3066a_i2s1_fracmux __initdata =

	MUX(SCLK_I2S1, "sclk_i2s1", mux_sclk_i2s1_p, 0,

	MUX(SCLK_I2S1, "sclk_i2s1", mux_sclk_i2s1_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(3), 8, 2, MFLAGS);



static struct rockchip_clk_branch rk3066a_i2s2_fracmux __initdata =

	MUX(SCLK_I2S2, "sclk_i2s2", mux_sclk_i2s2_p, 0,

	MUX(SCLK_I2S2, "sclk_i2s2", mux_sclk_i2s2_p, CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(4), 8, 2, MFLAGS);



static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = {
@@ -615,27 +614,28 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { 
	COMPOSITE_NOMUX(0, "i2s0_pre", "i2s_src", 0,

			RK2928_CLKSEL_CON(2), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(0), 7, GFLAGS),

	COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_pre", 0,

	COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(6), 0,

			RK2928_CLKGATE_CON(0), 8, GFLAGS,

			&rk3066a_i2s0_fracmux),

	COMPOSITE_NOMUX(0, "i2s1_pre", "i2s_src", 0,

			RK2928_CLKSEL_CON(3), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(0), 9, GFLAGS),

	COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_pre", 0,

	COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(7), 0,

			RK2928_CLKGATE_CON(0), 10, GFLAGS,

			&rk3066a_i2s1_fracmux),

	COMPOSITE_NOMUX(0, "i2s2_pre", "i2s_src", 0,

			RK2928_CLKSEL_CON(4), 0, 7, DFLAGS,

			RK2928_CLKGATE_CON(0), 11, GFLAGS),

	COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_pre", 0,

	COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_pre", CLK_SET_RATE_PARENT,

			RK2928_CLKSEL_CON(8), 0,

			RK2928_CLKGATE_CON(0), 12, GFLAGS,

			&rk3066a_i2s2_fracmux),



	GATE(HCLK_I2S1, "hclk_i2s1", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS),

	GATE(HCLK_I2S2, "hclk_i2s2", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS),

	GATE(HCLK_I2S0, "hclk_i2s0", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS),

	GATE(HCLK_I2S1, "hclk_i2s1", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS),

	GATE(HCLK_I2S2, "hclk_i2s2", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS),

	GATE(HCLK_CIF1, "hclk_cif1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 6, GFLAGS),

	GATE(HCLK_HDMI, "hclk_hdmi", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS),
@@ -728,6 +728,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { 
			RK2928_CLKGATE_CON(0), 10, GFLAGS,

			&rk3188_i2s0_fracmux),



	GATE(HCLK_I2S0, "hclk_i2s0", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS),

	GATE(0, "hclk_imem0", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS),

	GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS),

drivers/clk/rockchip/clk.c

+1 −2
Original line number Diff line number Diff line
@@ -603,7 +603,6 @@ void rockchip_clk_protect_critical(const char *const clocks[], 
	for (i = 0; i < nclocks; i++) {

		struct clk *clk = __clk_lookup(clocks[i]);



		if (clk)

		clk_prepare_enable(clk);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE