clk: sunxi: Change compatibles pattern
Subsystems (4)
v2 cover clk: sunxi: Change compatibles pattern
Hi,
This is the second version of the clock compatible changes. The only difference with the v1 being that we're now droping the old compatibles, instead of keeping them, since the DT maintainers said it was fine.
Thanks,
Maxime
Maxime Ripard (2):
clk: sunxi: Add new clock compatibles
ARM: sunxi: dt: Convert to the new clock compatibles
Documentation/devicetree/bindings/clock/sunxi.txt | 36 +++++++------- arch/arm/boot/dts/sun4i-a10.dtsi | 60 +++++++++++------------ arch/arm/boot/dts/sun5i-a10s.dtsi | 48 +++++++++--------- arch/arm/boot/dts/sun5i-a13.dtsi | 48 +++++++++--------- arch/arm/boot/dts/sun6i-a31.dtsi | 10 ++-- arch/arm/boot/dts/sun7i-a20.dtsi | 54 ++++++++++---------- drivers/clk/sunxi/clk-sunxi.c | 30 ++++++------ 7 files changed, 143 insertions(+), 143 deletions(-)
Signature · 1 line
1.8.4.2
PATCH v2 1/2 clk: sunxi: Add new clock compatibles
The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Add compatibles matching the other pattern to the clock driver for consistency, and keep the older one for backward compatibility.
--- Documentation/devicetree/bindings/clock/sunxi.txt | 36 +++++++++++------------ drivers/clk/sunxi/clk-sunxi.c | 30 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-)
Documentation/devicetree/bindings/clock/sunxi.txt +18 -18
@@ -6,36 +6,36 @@ This binding uses the common clock binding[1]. Required properties: - compatible : shall be one of the following: - "allwinner,sun4i-osc-clk" - for a gatable oscillator - "allwinner,sun4i-pll1-clk" - for the main PLL clock and PLL4 + "allwinner,sun4i-a10-osc-clk" - for a gatable oscillator + "allwinner,sun4i-a10-pll1-clk" - for the main PLL clock and PLL4 "allwinner,sun6i-a31-pll1-clk" - for the main PLL clock on A31 - "allwinner,sun4i-pll5-clk" - for the PLL5 clock - "allwinner,sun4i-pll6-clk" - for the PLL6 clock - "allwinner,sun4i-cpu-clk" - for the CPU multiplexer clock - "allwinner,sun4i-axi-clk" - for the AXI clock - "allwinner,sun4i-axi-gates-clk" - for the AXI gates - "allwinner,sun4i-ahb-clk" - for the AHB clock - "allwinner,sun4i-ahb-gates-clk" - for the AHB gates on A10 + "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock + "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock + "allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock + "allwinner,sun4i-a10-axi-clk" - for the AXI clock + "allwinner,sun4i-a10-axi-gates-clk" - for the AXI gates + "allwinner,sun4i-a10-ahb-clk" - for the AHB clock + "allwinner,sun4i-a10-ahb-gates-clk" - for the AHB gates on A10 "allwinner,sun5i-a13-ahb-gates-clk" - for the AHB gates on A13 "allwinner,sun5i-a10s-ahb-gates-clk" - for the AHB gates on A10s "allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20 "allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31 "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 - "allwinner,sun4i-apb0-clk" - for the APB0 clock - "allwinner,sun4i-apb0-gates-clk" - for the APB0 gates on A10 + "allwinner,sun4i-a10-apb0-clk" - for the APB0 clock + "allwinner,sun4i-a10-apb0-gates-clk" - for the APB0 gates on A10 "allwinner,sun5i-a13-apb0-gates-clk" - for the APB0 gates on A13 "allwinner,sun5i-a10s-apb0-gates-clk" - for the APB0 gates on A10s "allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20 - "allwinner,sun4i-apb1-clk" - for the APB1 clock - "allwinner,sun4i-apb1-mux-clk" - for the APB1 clock muxing - "allwinner,sun4i-apb1-gates-clk" - for the APB1 gates on A10 + "allwinner,sun4i-a10-apb1-clk" - for the APB1 clock + "allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing + "allwinner,sun4i-a10-apb1-gates-clk" - for the APB1 gates on A10 "allwinner,sun5i-a13-apb1-gates-clk" - for the APB1 gates on A13 "allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s "allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31 "allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20 "allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31 "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 - "allwinner,sun4i-mod0-clk" - for the module 0 family of clocks + "allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks "allwinner,sun7i-a20-out-clk" - for the external output clocks Required properties for all clocks:
@@ -58,21 +58,21 @@ For example: osc24M: osc24M at 01c20050 { #clock-cells = <0>; - compatible = "allwinner,sun4i-osc-clk"; + compatible = "allwinner,sun4i-a10-osc-clk"; reg = <0x01c20050 0x4>; clocks = <&osc24M_fixed>; }; pll1: pll1 at 01c20000 { #clock-cells = <0>; - compatible = "allwinner,sun4i-pll1-clk"; + compatible = "allwinner,sun4i-a10-pll1-clk"; reg = <0x01c20000 0x4>; clocks = <&osc24M>; }; cpu: cpu at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-cpu-clk"; + compatible = "allwinner,sun4i-a10-cpu-clk"; reg = <0x01c20054 0x4>; clocks = <&osc32k>, <&osc24M>, <&pll1>; };
drivers/clk/sunxi/clk-sunxi.c +15 -15
@@ -77,7 +77,7 @@ err_free_gate: err_free_fixed:kfree (fixed); } -CLK_OF_DECLARE (sun4i_osc,"allwinner,sun4i-osc-clk" , sun4i_osc_clk_setup); +CLK_OF_DECLARE (sun4i_osc,"allwinner,sun4i-a10-osc-clk" , sun4i_osc_clk_setup);
@@ -970,51 +970,51 @@ free_clkdata:/* Matches for factors clocks */ static const struct of_device_id clk_factors_match[]__initconst = { - {.compatible ="allwinner,sun4i-pll1-clk" , .data = &sun4i_pll1_data,}, + {.compatible ="allwinner,sun4i-a10-pll1-clk" , .data = &sun4i_pll1_data,}, {.compatible ="allwinner,sun6i-a31-pll1-clk" , .data = &sun6i_a31_pll1_data,}, - {.compatible ="allwinner,sun4i-apb1-clk" , .data = &sun4i_apb1_data,}, - {.compatible ="allwinner,sun4i-mod0-clk" , .data = &sun4i_mod0_data,}, + {.compatible ="allwinner,sun4i-a10-apb1-clk" , .data = &sun4i_apb1_data,}, + {.compatible ="allwinner,sun4i-a10-mod0-clk" , .data = &sun4i_mod0_data,}, {.compatible ="allwinner,sun7i-a20-out-clk" , .data = &sun7i_a20_out_data,}, {} };/* Matches for divider clocks */ static const struct of_device_id clk_div_match[]__initconst = { - {.compatible ="allwinner,sun4i-axi-clk" , .data = &sun4i_axi_data,}, - {.compatible ="allwinner,sun4i-ahb-clk" , .data = &sun4i_ahb_data,}, - {.compatible ="allwinner,sun4i-apb0-clk" , .data = &sun4i_apb0_data,}, + {.compatible ="allwinner,sun4i-a10-axi-clk" , .data = &sun4i_axi_data,}, + {.compatible ="allwinner,sun4i-a10-ahb-clk" , .data = &sun4i_ahb_data,}, + {.compatible ="allwinner,sun4i-a10-apb0-clk" , .data = &sun4i_apb0_data,}, {.compatible ="allwinner,sun6i-a31-apb2-div-clk" , .data = &sun6i_a31_apb2_div_data,}, {} };/* Matches for divided outputs */ static const struct of_device_id clk_divs_match[]__initconst = { - {.compatible ="allwinner,sun4i-pll5-clk" , .data = &pll5_divs_data,}, - {.compatible ="allwinner,sun4i-pll6-clk" , .data = &pll6_divs_data,}, + {.compatible ="allwinner,sun4i-a10-pll5-clk" , .data = &pll5_divs_data,}, + {.compatible ="allwinner,sun4i-a10-pll6-clk" , .data = &pll6_divs_data,}, {} };/* Matches for mux clocks */ static const struct of_device_id clk_mux_match[]__initconst = { - {.compatible ="allwinner,sun4i-cpu-clk" , .data = &sun4i_cpu_mux_data,}, - {.compatible ="allwinner,sun4i-apb1-mux-clk" , .data = &sun4i_apb1_mux_data,}, + {.compatible ="allwinner,sun4i-a10-cpu-clk" , .data = &sun4i_cpu_mux_data,}, + {.compatible ="allwinner,sun4i-a10-apb1-mux-clk" , .data = &sun4i_apb1_mux_data,}, {.compatible ="allwinner,sun6i-a31-ahb1-mux-clk" , .data = &sun6i_a31_ahb1_mux_data,}, {} };/* Matches for gate clocks */ static const struct of_device_id clk_gates_match[]__initconst = { - {.compatible ="allwinner,sun4i-axi-gates-clk" , .data = &sun4i_axi_gates_data,}, - {.compatible ="allwinner,sun4i-ahb-gates-clk" , .data = &sun4i_ahb_gates_data,}, + {.compatible ="allwinner,sun4i-a10-axi-gates-clk" , .data = &sun4i_axi_gates_data,}, + {.compatible ="allwinner,sun4i-a10-ahb-gates-clk" , .data = &sun4i_ahb_gates_data,}, {.compatible ="allwinner,sun5i-a10s-ahb-gates-clk" , .data = &sun5i_a10s_ahb_gates_data,}, {.compatible ="allwinner,sun5i-a13-ahb-gates-clk" , .data = &sun5i_a13_ahb_gates_data,}, {.compatible ="allwinner,sun6i-a31-ahb1-gates-clk" , .data = &sun6i_a31_ahb1_gates_data,}, {.compatible ="allwinner,sun7i-a20-ahb-gates-clk" , .data = &sun7i_a20_ahb_gates_data,}, - {.compatible ="allwinner,sun4i-apb0-gates-clk" , .data = &sun4i_apb0_gates_data,}, + {.compatible ="allwinner,sun4i-a10-apb0-gates-clk" , .data = &sun4i_apb0_gates_data,}, {.compatible ="allwinner,sun5i-a10s-apb0-gates-clk" , .data = &sun5i_a10s_apb0_gates_data,}, {.compatible ="allwinner,sun5i-a13-apb0-gates-clk" , .data = &sun5i_a13_apb0_gates_data,}, {.compatible ="allwinner,sun7i-a20-apb0-gates-clk" , .data = &sun7i_a20_apb0_gates_data,}, - {.compatible ="allwinner,sun4i-apb1-gates-clk" , .data = &sun4i_apb1_gates_data,}, + {.compatible ="allwinner,sun4i-a10-apb1-gates-clk" , .data = &sun4i_apb1_gates_data,}, {.compatible ="allwinner,sun5i-a10s-apb1-gates-clk" , .data = &sun5i_a10s_apb1_gates_data,}, {.compatible ="allwinner,sun5i-a13-apb1-gates-clk" , .data = &sun5i_a13_apb1_gates_data,}, {.compatible ="allwinner,sun6i-a31-apb1-gates-clk" , .data = &sun6i_a31_apb1_gates_data,},
Signature · 1 line
1.8.4.2
Emilio López
maintainerPATCH v2 1/2 clk: sunxi: Add new clock compatibles
Hi Maxime,
El 06/02/14 05:55, Maxime Ripard escribi?:
Quoted 6 lines
The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Add compatibles matching the other pattern to the clock driver for consistency, and keep the older one for backward compatibility.
Signed-off-by Maxime Ripard <[email protected]>
I have taken this patch on sunxi-clk-for-mike. Please note that there were some conflicts which I had to fix, so I'd appreciate it if you could check I didn't miss anything.
Thanks!
Emilio
PATCH v2 2/2 ARM: sunxi: dt: Convert to the new clock compatibles
In reply to Maxime RipardSwitch the device tree to the new compatibles introduced in the clock drivers to have a common pattern accross all Allwinner SoCs.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 60 +++++++++++++++++++-------------------- arch/arm/boot/dts/sun5i-a10s.dtsi | 48 +++++++++++++++---------------- arch/arm/boot/dts/sun5i-a13.dtsi | 48 +++++++++++++++---------------- arch/arm/boot/dts/sun6i-a31.dtsi | 10 +++---- arch/arm/boot/dts/sun7i-a20.dtsi | 54 +++++++++++++++++------------------ 5 files changed, 110 insertions(+), 110 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +30 -30
@@ -60,7 +60,7 @@ osc24M: osc24M at 01c20050 { #clock-cells = <0>; - compatible = "allwinner,sun4i-osc-clk"; + compatible = "allwinner,sun4i-a10-osc-clk"; reg = <0x01c20050 0x4>; clock-frequency = <24000000>; };
@@ -73,21 +73,21 @@ pll1: pll1 at 01c20000 { #clock-cells = <0>; - compatible = "allwinner,sun4i-pll1-clk"; + compatible = "allwinner,sun4i-a10-pll1-clk"; reg = <0x01c20000 0x4>; clocks = <&osc24M>; }; pll4: pll4 at 01c20018 { #clock-cells = <0>; - compatible = "allwinner,sun4i-pll1-clk"; + compatible = "allwinner,sun4i-a10-pll1-clk"; reg = <0x01c20018 0x4>; clocks = <&osc24M>; }; pll5: pll5 at 01c20020 { #clock-cells = <1>; - compatible = "allwinner,sun4i-pll5-clk"; + compatible = "allwinner,sun4i-a10-pll5-clk"; reg = <0x01c20020 0x4>; clocks = <&osc24M>; clock-output-names = "pll5_ddr", "pll5_other";
@@ -95,7 +95,7 @@ pll6: pll6 at 01c20028 { #clock-cells = <1>; - compatible = "allwinner,sun4i-pll6-clk"; + compatible = "allwinner,sun4i-a10-pll6-clk"; reg = <0x01c20028 0x4>; clocks = <&osc24M>; clock-output-names = "pll6_sata", "pll6_other", "pll6";
@@ -104,21 +104,21 @@ /* dummy is 200M */ cpu: cpu at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-cpu-clk"; + compatible = "allwinner,sun4i-a10-cpu-clk"; reg = <0x01c20054 0x4>; clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>; }; axi: axi at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-axi-clk"; + compatible = "allwinner,sun4i-a10-axi-clk"; reg = <0x01c20054 0x4>; clocks = <&cpu>; }; axi_gates: axi_gates at 01c2005c { #clock-cells = <1>; - compatible = "allwinner,sun4i-axi-gates-clk"; + compatible = "allwinner,sun4i-a10-axi-gates-clk"; reg = <0x01c2005c 0x4>; clocks = <&axi>; clock-output-names = "axi_dram";
@@ -126,14 +126,14 @@ ahb: ahb at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-ahb-clk"; + compatible = "allwinner,sun4i-a10-ahb-clk"; reg = <0x01c20054 0x4>; clocks = <&axi>; }; ahb_gates: ahb_gates at 01c20060 { #clock-cells = <1>; - compatible = "allwinner,sun4i-ahb-gates-clk"; + compatible = "allwinner,sun4i-a10-ahb-gates-clk"; reg = <0x01c20060 0x8>; clocks = <&ahb>; clock-output-names = "ahb_usb0", "ahb_ehci0",
@@ -151,14 +151,14 @@ apb0: apb0 at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-apb0-clk"; + compatible = "allwinner,sun4i-a10-apb0-clk"; reg = <0x01c20054 0x4>; clocks = <&ahb>; }; apb0_gates: apb0_gates at 01c20068 { #clock-cells = <1>; - compatible = "allwinner,sun4i-apb0-gates-clk"; + compatible = "allwinner,sun4i-a10-apb0-gates-clk"; reg = <0x01c20068 0x4>; clocks = <&apb0>; clock-output-names = "apb0_codec", "apb0_spdif",
@@ -168,21 +168,21 @@ apb1_mux: apb1_mux at 01c20058 { #clock-cells = <0>; - compatible = "allwinner,sun4i-apb1-mux-clk"; + compatible = "allwinner,sun4i-a10-apb1-mux-clk"; reg = <0x01c20058 0x4>; clocks = <&osc24M>, <&pll6 1>, <&osc32k>; }; apb1: apb1 at 01c20058 { #clock-cells = <0>; - compatible = "allwinner,sun4i-apb1-clk"; + compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; clocks = <&apb1_mux>; }; apb1_gates: apb1_gates at 01c2006c { #clock-cells = <1>; - compatible = "allwinner,sun4i-apb1-gates-clk"; + compatible = "allwinner,sun4i-a10-apb1-gates-clk"; reg = <0x01c2006c 0x4>; clocks = <&apb1>; clock-output-names = "apb1_i2c0", "apb1_i2c1",
@@ -195,7 +195,7 @@ nand_clk: clk at 01c20080 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c20080 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "nand";
@@ -203,7 +203,7 @@ ms_clk: clk at 01c20084 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c20084 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "ms";
@@ -211,7 +211,7 @@ mmc0_clk: clk at 01c20088 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c20088 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "mmc0";
@@ -219,7 +219,7 @@ mmc1_clk: clk at 01c2008c { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c2008c 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "mmc1";
@@ -227,7 +227,7 @@ mmc2_clk: clk at 01c20090 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c20090 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "mmc2";
@@ -235,7 +235,7 @@ mmc3_clk: clk at 01c20094 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c20094 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "mmc3";
@@ -243,7 +243,7 @@ ts_clk: clk at 01c20098 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c20098 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "ts";
@@ -251,7 +251,7 @@ ss_clk: clk at 01c2009c { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c2009c 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "ss";
@@ -259,7 +259,7 @@ spi0_clk: clk at 01c200a0 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200a0 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "spi0";
@@ -267,7 +267,7 @@ spi1_clk: clk at 01c200a4 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200a4 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "spi1";
@@ -275,7 +275,7 @@ spi2_clk: clk at 01c200a8 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200a8 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "spi2";
@@ -283,7 +283,7 @@ pata_clk: clk at 01c200ac { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200ac 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "pata";
@@ -291,7 +291,7 @@ ir0_clk: clk at 01c200b0 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200b0 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "ir0";
@@ -299,7 +299,7 @@ ir1_clk: clk at 01c200b4 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200b4 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "ir1";
@@ -307,7 +307,7 @@ spi3_clk: clk at 01c200d4 { #clock-cells = <0>; - compatible = "allwinner,sun4i-mod0-clk"; + compatible = "allwinner,sun4i-a10-mod0-clk"; reg = <0x01c200d4 0x4>; clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "spi3";
arch/arm/boot/dts/sun5i-a10s.dtsi +24 -24
192 lines not on this page · raw message
arch/arm/boot/dts/sun5i-a13.dtsi +24 -24
192 lines not on this page · raw message
arch/arm/boot/dts/sun6i-a31.dtsi +5 -5
@@ -97,7 +97,7 @@ cpu: cpu at 01c20050 { #clock-cells = <0>; - compatible = "allwinner,sun4i-cpu-clk"; + compatible = "allwinner,sun4i-a10-cpu-clk"; reg = <0x01c20050 0x4>; /*
@@ -111,7 +111,7 @@ axi: axi at 01c20050 { #clock-cells = <0>; - compatible = "allwinner,sun4i-axi-clk"; + compatible = "allwinner,sun4i-a10-axi-clk"; reg = <0x01c20050 0x4>; clocks = <&cpu>; };
@@ -125,7 +125,7 @@ ahb1: ahb1 at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-ahb-clk"; + compatible = "allwinner,sun4i-a10-ahb-clk"; reg = <0x01c20054 0x4>; clocks = <&ahb1_mux>; };
@@ -153,7 +153,7 @@ apb1: apb1 at 01c20054 { #clock-cells = <0>; - compatible = "allwinner,sun4i-apb0-clk"; + compatible = "allwinner,sun4i-a10-apb0-clk"; reg = <0x01c20054 0x4>; clocks = <&ahb1>; };
@@ -170,7 +170,7 @@ apb2_mux: apb2_mux at 01c20058 { #clock-cells = <0>; - compatible = "allwinner,sun4i-apb1-mux-clk"; + compatible = "allwinner,sun4i-a10-apb1-mux-clk"; reg = <0x01c20058 0x4>; clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; };
arch/arm/boot/dts/sun7i-a20.dtsi +27 -27
216 lines not on this page · raw message
Signature · 1 line
1.8.4.2
PATCH v2 2/2 ARM: sunxi: dt: Convert to the new clock compatibles
Quoted 4 lines · Maxime Ripard
Switch the device tree to the new compatibles introduced in the clock drivers to have a common pattern accross all Allwinner SoCs.
Signed-off-by Maxime Ripard <[email protected]>
Just applied it.
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140218/2a166fe9/attachment.sig>
v2 cover clk: sunxi: Change compatibles pattern
In reply to Maxime RipardQuoting Maxime Ripard (2014-02-06 00:55:56)
Quoted 6 lines
Hi,
This is the second version of the clock compatible changes. The only difference with the v1 being that we're now droping the old compatibles, instead of keeping them, since the DT maintainers said it was fine.
Both look good to me.
Regards,
Mike
Quoted 20 lines
Thanks,
MaximeMaxime Ripard (2):
clk: sunxi: Add new clock compatibles
ARM: sunxi: dt: Convert to the new clock compatiblesDocumentation/devicetree/bindings/clock/sunxi.txt | 36 +++++++------- arch/arm/boot/dts/sun4i-a10.dtsi | 60 +++++++++++------------ arch/arm/boot/dts/sun5i-a10s.dtsi | 48 +++++++++--------- arch/arm/boot/dts/sun5i-a13.dtsi | 48 +++++++++--------- arch/arm/boot/dts/sun6i-a31.dtsi | 10 ++-- arch/arm/boot/dts/sun7i-a20.dtsi | 54 ++++++++++---------- drivers/clk/sunxi/clk-sunxi.c | 30 ++++++------ 7 files changed, 143 insertions(+), 143 deletions(-)Signature · 1 line
1.8.4.2