You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
107 lines
2.9 KiB
107 lines
2.9 KiB
From 8bd1bb3a670aae791c4b2e9ab13c92768233368a Mon Sep 17 00:00:00 2001
|
|
From: Chen-Yu Tsai <wens@csie.org>
|
|
Date: Mon, 3 Feb 2014 09:51:43 +0800
|
|
Subject: [PATCH] ARM: dts: sun6i: rename clock node names to clk@N
|
|
|
|
Device tree naming conventions state that node names should match
|
|
node function. Change fully functioning clock nodes to match and
|
|
add clock-output-names to all sunxi clock nodes.
|
|
|
|
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
arch/arm/boot/dts/sun6i-a31.dtsi | 19 ++++++++++++++-----
|
|
1 file changed, 14 insertions(+), 5 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
|
|
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
|
|
@@ -70,17 +70,19 @@
|
|
clock-frequency = <24000000>;
|
|
};
|
|
|
|
- osc32k: osc32k {
|
|
+ osc32k: clk@0 {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
clock-frequency = <32768>;
|
|
+ clock-output-names = "osc32k";
|
|
};
|
|
|
|
- pll1: pll1@01c20000 {
|
|
+ pll1: clk@01c20000 {
|
|
#clock-cells = <0>;
|
|
compatible = "allwinner,sun6i-a31-pll1-clk";
|
|
reg = <0x01c20000 0x4>;
|
|
clocks = <&osc24M>;
|
|
+ clock-output-names = "pll1";
|
|
};
|
|
|
|
pll6: clk@01c20028 {
|
|
@@ -103,6 +105,7 @@
|
|
* Allwinner.
|
|
*/
|
|
clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll1>;
|
|
+ clock-output-names = "cpu";
|
|
};
|
|
|
|
axi: axi@01c20050 {
|
|
@@ -110,6 +113,7 @@
|
|
compatible = "allwinner,sun4i-axi-clk";
|
|
reg = <0x01c20050 0x4>;
|
|
clocks = <&cpu>;
|
|
+ clock-output-names = "axi";
|
|
};
|
|
|
|
ahb1_mux: ahb1_mux@01c20054 {
|
|
@@ -117,6 +121,7 @@
|
|
compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
|
|
reg = <0x01c20054 0x4>;
|
|
clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
|
|
+ clock-output-names = "ahb1_mux";
|
|
};
|
|
|
|
ahb1: ahb1@01c20054 {
|
|
@@ -124,9 +129,10 @@
|
|
compatible = "allwinner,sun4i-ahb-clk";
|
|
reg = <0x01c20054 0x4>;
|
|
clocks = <&ahb1_mux>;
|
|
+ clock-output-names = "ahb1";
|
|
};
|
|
|
|
- ahb1_gates: ahb1_gates@01c20060 {
|
|
+ ahb1_gates: clk@01c20060 {
|
|
#clock-cells = <1>;
|
|
compatible = "allwinner,sun6i-a31-ahb1-gates-clk";
|
|
reg = <0x01c20060 0x8>;
|
|
@@ -152,9 +158,10 @@
|
|
compatible = "allwinner,sun4i-apb0-clk";
|
|
reg = <0x01c20054 0x4>;
|
|
clocks = <&ahb1>;
|
|
+ clock-output-names = "apb1";
|
|
};
|
|
|
|
- apb1_gates: apb1_gates@01c20060 {
|
|
+ apb1_gates: clk@01c20068 {
|
|
#clock-cells = <1>;
|
|
compatible = "allwinner,sun6i-a31-apb1-gates-clk";
|
|
reg = <0x01c20068 0x4>;
|
|
@@ -169,6 +176,7 @@
|
|
compatible = "allwinner,sun4i-apb1-mux-clk";
|
|
reg = <0x01c20058 0x4>;
|
|
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
|
|
+ clock-output-names = "apb2_mux";
|
|
};
|
|
|
|
apb2: apb2@01c20058 {
|
|
@@ -176,9 +184,10 @@
|
|
compatible = "allwinner,sun6i-a31-apb2-div-clk";
|
|
reg = <0x01c20058 0x4>;
|
|
clocks = <&apb2_mux>;
|
|
+ clock-output-names = "apb2";
|
|
};
|
|
|
|
- apb2_gates: apb2_gates@01c2006c {
|
|
+ apb2_gates: clk@01c2006c {
|
|
#clock-cells = <1>;
|
|
compatible = "allwinner,sun6i-a31-apb2-gates-clk";
|
|
reg = <0x01c2006c 0x4>;
|
|
|