[PATCH 5/6] arm: dts: sun7i: rename clock node names to clk@N
From: Chen-Yu Tsai <hidden>
Date: 2014-01-03 08:01:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
Device tree naming conventions state that node names should match node function. Change fully functioning clock nodes to match. Signed-off-by: Chen-Yu Tsai <redacted> --- arch/arm/boot/dts/sun7i-a20.dtsi | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 0062811..2a78de4 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi@@ -46,11 +46,12 @@ #size-cells = <1>; ranges; - osc24M: osc24M at 01c20050 { + osc24M: clk at 01c20050 { #clock-cells = <0>; compatible = "allwinner,sun4i-osc-clk"; reg = <0x01c20050 0x4>; clock-frequency = <24000000>; + clock-output-names = "osc24M"; }; osc32k: clk at 0 {
@@ -60,21 +61,23 @@ clock-output-names = "osc32k"; }; - pll1: pll1 at 01c20000 { + pll1: clk at 01c20000 { #clock-cells = <0>; compatible = "allwinner,sun4i-pll1-clk"; reg = <0x01c20000 0x4>; clocks = <&osc24M>; + clock-output-names = "pll1"; }; - pll4: pll4 at 01c20018 { + pll4: clk at 01c20018 { #clock-cells = <0>; compatible = "allwinner,sun4i-pll1-clk"; reg = <0x01c20018 0x4>; clocks = <&osc24M>; + clock-output-names = "pll4"; }; - pll5: pll5 at 01c20020 { + pll5: clk at 01c20020 { #clock-cells = <1>; compatible = "allwinner,sun4i-pll5-clk"; reg = <0x01c20020 0x4>;
@@ -82,7 +85,7 @@ clock-output-names = "pll5_ddr", "pll5_other"; }; - pll6: pll6 at 01c20028 { + pll6: clk at 01c20028 { #clock-cells = <1>; compatible = "allwinner,sun4i-pll6-clk"; reg = <0x01c20028 0x4>;
@@ -111,7 +114,7 @@ clocks = <&axi>; }; - ahb_gates: ahb_gates at 01c20060 { + ahb_gates: clk at 01c20060 { #clock-cells = <1>; compatible = "allwinner,sun7i-a20-ahb-gates-clk"; reg = <0x01c20060 0x8>;
@@ -138,7 +141,7 @@ clocks = <&ahb>; }; - apb0_gates: apb0_gates at 01c20068 { + apb0_gates: clk at 01c20068 { #clock-cells = <1>; compatible = "allwinner,sun7i-a20-apb0-gates-clk"; reg = <0x01c20068 0x4>;
@@ -163,7 +166,7 @@ clocks = <&apb1_mux>; }; - apb1_gates: apb1_gates at 01c2006c { + apb1_gates: clk at 01c2006c { #clock-cells = <1>; compatible = "allwinner,sun7i-a20-apb1-gates-clk"; reg = <0x01c2006c 0x4>;
--
1.8.5.2