clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
Subsystems (2)
PATCH v3 1/2 clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
Add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks, so that the parent COMPOSITE_FRACMUX and COMPOSITE_NOMUX also update.
--- drivers/clk/rockchip/clk-rk3188.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/clk/rockchip/clk-rk3188.c +14 -14
@@ -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),
@@ -543,15 +543,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,21 +615,21 @@ 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),
Signature · 1 line
2.11.0
PATCH v3 2/2 clk: rockchip: fix i2s gate bits on rk3066 and rk3188
The Rockchip PX2/RK3066 uses these bits in CRU_CLKGATE7_CON:
hclk_i2s_8ch_gate_en bit 4 (dtsi: i2s0)hclk_i2s0_2ch_gate_en bit 2 (dtsi: i2s1)hclk_i2s1_2ch_gate_en bit 3 (dtsi: i2s2)
The Rockchip PX3/RK3188 uses this bit in CRU_CLKGATE7_CON:
hclk_i2s_2ch_gate_en bit 2 (dtsi: i2s0)
The bits got somehow mixed up in the clk-rk3188.c file. The labels in the dtsi files are not suppose to change. The sclk and hclk names should match for "trace_event=clk_disable,clk_enable",
so remove GATE HCLK_I2S0 from the common clock tree and fix the bits in the rk3066 and rk3188 clock tree.
---
Changed V3:
reword
--- drivers/clk/rockchip/clk-rk3188.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/clk/rockchip/clk-rk3188.c +4 -3
@@ -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 */
@@ -634,8 +633,9 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { 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),
Signature · 1 line
2.11.0