[PATCH 0/4] Fix avoid_unnecessary_addr_size DTC warning with 'clocks' node

[PATCH 0/4] Fix avoid_unnecessary_addr_size DTC warning with 'clocks' node

[Shawn Guo]

The series is to clean up avoid_unnecessary_addr_size DTC warning seen
with 'clocks' container node in i.MX dts files.

Shawn Guo (4):
  ARM: dts: imx: drop unnecessary #address-cells/#size-cells
  ARM: dts: imx1: move clk32 clock into soc dtsi
  ARM: dts: imx27: use lable to override osc26m clock setting
  ARM: dts: imx: drop 'clocks' container for board level clocks

 arch/arm/boot/dts/imx1-ads.dts               | 11 -----------
 arch/arm/boot/dts/imx1.dtsi                  |  8 ++++++++
 arch/arm/boot/dts/imx25.dtsi                 |  3 ---
 arch/arm/boot/dts/imx27-apf27.dts            | 13 +++----------
 arch/arm/boot/dts/imx27.dtsi                 |  5 +----
 arch/arm/boot/dts/imx28-tx28.dts             | 13 ++++---------
 arch/arm/boot/dts/imx50.dtsi                 |  3 ---
 arch/arm/boot/dts/imx51.dtsi                 |  3 ---
 arch/arm/boot/dts/imx53-tx53.dtsi            | 11 +++++------
 arch/arm/boot/dts/imx53.dtsi                 |  3 ---
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++---------
 arch/arm/boot/dts/imx6q-bx50v3.dtsi          | 11 ++++-------
 arch/arm/boot/dts/imx6qdl.dtsi               |  3 ---
 arch/arm/boot/dts/imx6sl.dtsi                |  3 ---
 14 files changed, 31 insertions(+), 74 deletions(-)

-- 
1.9.1

[PATCH 0/4] Fix avoid_unnecessary_addr_size DTC warning with 'clocks' node

[Shawn Guo]

The series is to clean up avoid_unnecessary_addr_size DTC warning seen
with 'clocks' container node in i.MX dts files.

Shawn Guo (4):
  ARM: dts: imx: drop unnecessary #address-cells/#size-cells
  ARM: dts: imx1: move clk32 clock into soc dtsi
  ARM: dts: imx27: use lable to override osc26m clock setting
  ARM: dts: imx: drop 'clocks' container for board level clocks

 arch/arm/boot/dts/imx1-ads.dts               | 11 -----------
 arch/arm/boot/dts/imx1.dtsi                  |  8 ++++++++
 arch/arm/boot/dts/imx25.dtsi                 |  3 ---
 arch/arm/boot/dts/imx27-apf27.dts            | 13 +++----------
 arch/arm/boot/dts/imx27.dtsi                 |  5 +----
 arch/arm/boot/dts/imx28-tx28.dts             | 13 ++++---------
 arch/arm/boot/dts/imx50.dtsi                 |  3 ---
 arch/arm/boot/dts/imx51.dtsi                 |  3 ---
 arch/arm/boot/dts/imx53-tx53.dtsi            | 11 +++++------
 arch/arm/boot/dts/imx53.dtsi                 |  3 ---
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++---------
 arch/arm/boot/dts/imx6q-bx50v3.dtsi          | 11 ++++-------
 arch/arm/boot/dts/imx6qdl.dtsi               |  3 ---
 arch/arm/boot/dts/imx6sl.dtsi                |  3 ---
 14 files changed, 31 insertions(+), 74 deletions(-)

-- 
1.9.1

[PATCH 1/4] ARM: dts: imx: drop unnecessary #address-cells/#size-cells

[Shawn Guo]

It drops unnecessary #address-cells/#size-cells from <soc>.dtsi 'clocks'
node to fix DTC warning avoid_unnecessary_addr_size seen with W=1
switch.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx25.dtsi   | 3 ---
 arch/arm/boot/dts/imx27.dtsi   | 3 ---
 arch/arm/boot/dts/imx50.dtsi   | 3 ---
 arch/arm/boot/dts/imx51.dtsi   | 3 ---
 arch/arm/boot/dts/imx53.dtsi   | 3 ---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
 arch/arm/boot/dts/imx6sl.dtsi  | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index cf70df20b19c..67606dd334bf 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -70,9 +70,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		osc {
 			compatible = "fsl,imx-osc", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 6585b00c3917..389c9288b4ed 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -57,9 +57,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		osc26m {
 			compatible = "fsl,imx-osc26m", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 7954e79d0a16..a9b712db9f6c 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -60,9 +60,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 5d390a64e976..b5db83cd7439 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -56,9 +56,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 7d647d043f52..d0db80150db7 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -88,9 +88,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 5332fe78cc8a..69648e205dca 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -58,9 +58,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index ab6a7e2e7e8f..2002db2feb00 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -86,9 +86,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
-- 
1.9.1

[PATCH 1/4] ARM: dts: imx: drop unnecessary #address-cells/#size-cells

[Shawn Guo]

It drops unnecessary #address-cells/#size-cells from <soc>.dtsi 'clocks'
node to fix DTC warning avoid_unnecessary_addr_size seen with W=1
switch.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx25.dtsi   | 3 ---
 arch/arm/boot/dts/imx27.dtsi   | 3 ---
 arch/arm/boot/dts/imx50.dtsi   | 3 ---
 arch/arm/boot/dts/imx51.dtsi   | 3 ---
 arch/arm/boot/dts/imx53.dtsi   | 3 ---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
 arch/arm/boot/dts/imx6sl.dtsi  | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index cf70df20b19c..67606dd334bf 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -70,9 +70,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		osc {
 			compatible = "fsl,imx-osc", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 6585b00c3917..389c9288b4ed 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -57,9 +57,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		osc26m {
 			compatible = "fsl,imx-osc26m", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 7954e79d0a16..a9b712db9f6c 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -60,9 +60,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 5d390a64e976..b5db83cd7439 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -56,9 +56,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 7d647d043f52..d0db80150db7 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -88,9 +88,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 5332fe78cc8a..69648e205dca 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -58,9 +58,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fsl,imx-ckil", "fixed-clock";
 			#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index ab6a7e2e7e8f..2002db2feb00 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -86,9 +86,6 @@
 	};
 
 	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 		ckil {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
-- 
1.9.1

[PATCH 2/4] ARM: dts: imx1: move clk32 clock into soc dtsi

[Shawn Guo]

The clk32 clock is an input clock to CCM module, and should be defined
in soc dtsi rather than a board level dts.  Let's move it into
imx1.dtsi.

While at it, let's drop unnecessary #address-cells/#size-cells from
'clocks' node to DTC warning avoid_unnecessary_addr_size seen with W=1
switch.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx1-ads.dts | 11 -----------
 arch/arm/boot/dts/imx1.dtsi    |  8 ++++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/imx1-ads.dts b/arch/arm/boot/dts/imx1-ads.dts
index 6354e4c87313..a1d81badb5c8 100644
--- a/arch/arm/boot/dts/imx1-ads.dts
+++ b/arch/arm/boot/dts/imx1-ads.dts
@@ -23,17 +23,6 @@
 	memory@8000000 {
 		reg = <0x08000000 0x04000000>;
 	};
-
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32 {
-			compatible = "fsl,imx-clk32", "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <32000>;
-		};
-	};
 };
 
 &cspi1 {
diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index f7b9edf93f5e..78cba9435f8e 100644
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -62,6 +62,14 @@
 		};
 	};
 
+	clocks {
+		clk32 {
+			compatible = "fsl,imx-clk32", "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <32000>;
+		};
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
-- 
1.9.1

[PATCH 2/4] ARM: dts: imx1: move clk32 clock into soc dtsi

[Shawn Guo]

The clk32 clock is an input clock to CCM module, and should be defined
in soc dtsi rather than a board level dts.  Let's move it into
imx1.dtsi.

While at it, let's drop unnecessary #address-cells/#size-cells from
'clocks' node to DTC warning avoid_unnecessary_addr_size seen with W=1
switch.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx1-ads.dts | 11 -----------
 arch/arm/boot/dts/imx1.dtsi    |  8 ++++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/imx1-ads.dts b/arch/arm/boot/dts/imx1-ads.dts
index 6354e4c87313..a1d81badb5c8 100644
--- a/arch/arm/boot/dts/imx1-ads.dts
+++ b/arch/arm/boot/dts/imx1-ads.dts
@@ -23,17 +23,6 @@
 	memory at 8000000 {
 		reg = <0x08000000 0x04000000>;
 	};
-
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32 {
-			compatible = "fsl,imx-clk32", "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <32000>;
-		};
-	};
 };
 
 &cspi1 {
diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index f7b9edf93f5e..78cba9435f8e 100644
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -62,6 +62,14 @@
 		};
 	};
 
+	clocks {
+		clk32 {
+			compatible = "fsl,imx-clk32", "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <32000>;
+		};
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
-- 
1.9.1

[PATCH 3/4] ARM: dts: imx27: use lable to override osc26m clock setting

[Shawn Guo]

Instead of copying the whole node hierarchy, let's define a label for
clock osc26m in soc dtsi and use it for overriding clock-frequency.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx27-apf27.dts | 13 +++----------
 arch/arm/boot/dts/imx27.dtsi      |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
index 66941cdbf244..3eddd805a793 100644
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -22,17 +22,10 @@
 	memory@a0000000 {
 		reg = <0xa0000000 0x04000000>;
 	};
+};
 
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		osc26m {
-			compatible = "fsl,imx-osc26m", "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <0>;
-		};
-	};
+&clk_osc26m {
+	clock-frequency = <0>;
 };
 
 &iomuxc {
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 389c9288b4ed..6c28b9cf802c 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -57,7 +57,7 @@
 	};
 
 	clocks {
-		osc26m {
+		clk_osc26m: osc26m {
 			compatible = "fsl,imx-osc26m", "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <26000000>;
-- 
1.9.1

[PATCH 3/4] ARM: dts: imx27: use lable to override osc26m clock setting

[Shawn Guo]

Instead of copying the whole node hierarchy, let's define a label for
clock osc26m in soc dtsi and use it for overriding clock-frequency.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx27-apf27.dts | 13 +++----------
 arch/arm/boot/dts/imx27.dtsi      |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
index 66941cdbf244..3eddd805a793 100644
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -22,17 +22,10 @@
 	memory at a0000000 {
 		reg = <0xa0000000 0x04000000>;
 	};
+};
 
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		osc26m {
-			compatible = "fsl,imx-osc26m", "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <0>;
-		};
-	};
+&clk_osc26m {
+	clock-frequency = <0>;
 };
 
 &iomuxc {
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 389c9288b4ed..6c28b9cf802c 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -57,7 +57,7 @@
 	};
 
 	clocks {
-		osc26m {
+		clk_osc26m: osc26m {
 			compatible = "fsl,imx-osc26m", "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <26000000>;
-- 
1.9.1

[PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks

[Shawn Guo]

For soc level of clocks which are input to Clock Control Module, clock
driver expects them to be under 'clocks' container node.  But for board
level clocks, this container is not really necessary.  Let's drop it and
use an unique name for fixed rate clock, so that 'reg' property can be
saved as well.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx28-tx28.dts             | 13 ++++---------
 arch/arm/boot/dts/imx53-tx53.dtsi            | 11 +++++------
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++---------
 arch/arm/boot/dts/imx6q-bx50v3.dtsi          | 11 ++++-------
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index 687186358c18..e4f19f9be6d0 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -140,15 +140,10 @@
 		regulator-boot-on;
 	};
 
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		mclk: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <26000000>;
-		};
+	mclk: clock-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <26000000>;
 	};
 
 	sound {
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 77f2ce9f1e41..5dd3dd3a2fd0 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -67,13 +67,12 @@
 		ckih1 {
 			clock-frequency = <0>;
 		};
+	};
 
-		mclk: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <26000000>;
-		};
+	mclk: clock-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <26000000>;
 	};
 
 	gpio-keys {
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index ea184d108491..3dee3af1a4c1 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -72,15 +72,12 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	clocks {
-		/* Fixed crystal dedicated to mcp251x */
-		clk16m: clk@1 {
-			compatible = "fixed-clock";
-			reg = <1>;
-			#clock-cells = <0>;
-			clock-frequency = <16000000>;
-			clock-output-names = "clk16m";
-		};
+	/* Fixed crystal dedicated to mcp251x */
+	clk16m: clock-16m {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <16000000>;
+		clock-output-names = "clk16m";
 	};
 
 	gpio-keys {
diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
index d0e7dab4d72b..d3cba09be0cb 100644
--- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi
+++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
@@ -43,13 +43,10 @@
 #include "imx6q-ba16.dtsi"
 
 / {
-	clocks {
-		mclk: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <22000000>;
-		};
+	mclk: clock-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <22000000>;
 	};
 
 	gpio-poweroff {
-- 
1.9.1

[PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks

[Shawn Guo]

For soc level of clocks which are input to Clock Control Module, clock
driver expects them to be under 'clocks' container node.  But for board
level clocks, this container is not really necessary.  Let's drop it and
use an unique name for fixed rate clock, so that 'reg' property can be
saved as well.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
 arch/arm/boot/dts/imx28-tx28.dts             | 13 ++++---------
 arch/arm/boot/dts/imx53-tx53.dtsi            | 11 +++++------
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++---------
 arch/arm/boot/dts/imx6q-bx50v3.dtsi          | 11 ++++-------
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index 687186358c18..e4f19f9be6d0 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -140,15 +140,10 @@
 		regulator-boot-on;
 	};
 
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		mclk: clock at 0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <26000000>;
-		};
+	mclk: clock-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <26000000>;
 	};
 
 	sound {
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 77f2ce9f1e41..5dd3dd3a2fd0 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -67,13 +67,12 @@
 		ckih1 {
 			clock-frequency = <0>;
 		};
+	};
 
-		mclk: clock at 0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <26000000>;
-		};
+	mclk: clock-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <26000000>;
 	};
 
 	gpio-keys {
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index ea184d108491..3dee3af1a4c1 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -72,15 +72,12 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	clocks {
-		/* Fixed crystal dedicated to mcp251x */
-		clk16m: clk at 1 {
-			compatible = "fixed-clock";
-			reg = <1>;
-			#clock-cells = <0>;
-			clock-frequency = <16000000>;
-			clock-output-names = "clk16m";
-		};
+	/* Fixed crystal dedicated to mcp251x */
+	clk16m: clock-16m {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <16000000>;
+		clock-output-names = "clk16m";
 	};
 
 	gpio-keys {
diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
index d0e7dab4d72b..d3cba09be0cb 100644
--- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi
+++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
@@ -43,13 +43,10 @@
 #include "imx6q-ba16.dtsi"
 
 / {
-	clocks {
-		mclk: clock at 0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <22000000>;
-		};
+	mclk: clock-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <22000000>;
 	};
 
 	gpio-poweroff {
-- 
1.9.1

Re: [PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks

[Lothar Waßmann]

Hi,

On Fri,  4 May 2018 08:57:26 +0800 Shawn Guo wrote:
> For soc level of clocks which are input to Clock Control Module, clock
> driver expects them to be under 'clocks' container node.  But for board
> level clocks, this container is not really necessary.  Let's drop it and
> use an unique name for fixed rate clock, so that 'reg' property can be
> saved as well.
> 
For imx28-tx28.dts and imx53-tx53.dtsi:
Acked-By: Lothar Waßmann <LW@KARO-electronics.de>

> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
> ---
>  arch/arm/boot/dts/imx28-tx28.dts             | 13 ++++---------
>  arch/arm/boot/dts/imx53-tx53.dtsi            | 11 +++++------
>  arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++---------
>  arch/arm/boot/dts/imx6q-bx50v3.dtsi          | 11 ++++-------
>  4 files changed, 19 insertions(+), 31 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
> index 687186358c18..e4f19f9be6d0 100644
> --- a/arch/arm/boot/dts/imx28-tx28.dts
> +++ b/arch/arm/boot/dts/imx28-tx28.dts
> @@ -140,15 +140,10 @@
>  		regulator-boot-on;
>  	};
>  
> -	clocks {
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -		mclk: clock@0 {
> -			compatible = "fixed-clock";
> -			reg = <0>;
> -			#clock-cells = <0>;
> -			clock-frequency = <26000000>;
> -		};
> +	mclk: clock-mclk {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <26000000>;
>  	};
>  
>  	sound {
> diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
> index 77f2ce9f1e41..5dd3dd3a2fd0 100644
> --- a/arch/arm/boot/dts/imx53-tx53.dtsi
> +++ b/arch/arm/boot/dts/imx53-tx53.dtsi
> @@ -67,13 +67,12 @@
>  		ckih1 {
>  			clock-frequency = <0>;
>  		};
> +	};
>  
> -		mclk: clock@0 {
> -			compatible = "fixed-clock";
> -			reg = <0>;
> -			#clock-cells = <0>;
> -			clock-frequency = <26000000>;
> -		};
> +	mclk: clock-mclk {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <26000000>;
>  	};
>  
>  	gpio-keys {
> diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
> index ea184d108491..3dee3af1a4c1 100644
> --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
> +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
> @@ -72,15 +72,12 @@
>  		stdout-path = "serial0:115200n8";
>  	};
>  
> -	clocks {
> -		/* Fixed crystal dedicated to mcp251x */
> -		clk16m: clk@1 {
> -			compatible = "fixed-clock";
> -			reg = <1>;
> -			#clock-cells = <0>;
> -			clock-frequency = <16000000>;
> -			clock-output-names = "clk16m";
> -		};
> +	/* Fixed crystal dedicated to mcp251x */
> +	clk16m: clock-16m {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <16000000>;
> +		clock-output-names = "clk16m";
>  	};
>  
>  	gpio-keys {
> diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
> index d0e7dab4d72b..d3cba09be0cb 100644
> --- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi
> +++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
> @@ -43,13 +43,10 @@
>  #include "imx6q-ba16.dtsi"
>  
>  / {
> -	clocks {
> -		mclk: clock@0 {
> -			compatible = "fixed-clock";
> -			reg = <0>;
> -			#clock-cells = <0>;
> -			clock-frequency = <22000000>;
> -		};
> +	mclk: clock-mclk {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <22000000>;
>  	};
>  
>  	gpio-poweroff {


Lothar Waßmann

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks

[Lothar Waßmann]

Hi,

On Fri,  4 May 2018 08:57:26 +0800 Shawn Guo wrote:
> For soc level of clocks which are input to Clock Control Module, clock
> driver expects them to be under 'clocks' container node.  But for board
> level clocks, this container is not really necessary.  Let's drop it and
> use an unique name for fixed rate clock, so that 'reg' property can be
> saved as well.
> 
For imx28-tx28.dts and imx53-tx53.dtsi:
Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>

> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
> ---
>  arch/arm/boot/dts/imx28-tx28.dts             | 13 ++++---------
>  arch/arm/boot/dts/imx53-tx53.dtsi            | 11 +++++------
>  arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++---------
>  arch/arm/boot/dts/imx6q-bx50v3.dtsi          | 11 ++++-------
>  4 files changed, 19 insertions(+), 31 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
> index 687186358c18..e4f19f9be6d0 100644
> --- a/arch/arm/boot/dts/imx28-tx28.dts
> +++ b/arch/arm/boot/dts/imx28-tx28.dts
> @@ -140,15 +140,10 @@
>  		regulator-boot-on;
>  	};
>  
> -	clocks {
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -		mclk: clock at 0 {
> -			compatible = "fixed-clock";
> -			reg = <0>;
> -			#clock-cells = <0>;
> -			clock-frequency = <26000000>;
> -		};
> +	mclk: clock-mclk {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <26000000>;
>  	};
>  
>  	sound {
> diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
> index 77f2ce9f1e41..5dd3dd3a2fd0 100644
> --- a/arch/arm/boot/dts/imx53-tx53.dtsi
> +++ b/arch/arm/boot/dts/imx53-tx53.dtsi
> @@ -67,13 +67,12 @@
>  		ckih1 {
>  			clock-frequency = <0>;
>  		};
> +	};
>  
> -		mclk: clock at 0 {
> -			compatible = "fixed-clock";
> -			reg = <0>;
> -			#clock-cells = <0>;
> -			clock-frequency = <26000000>;
> -		};
> +	mclk: clock-mclk {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <26000000>;
>  	};
>  
>  	gpio-keys {
> diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
> index ea184d108491..3dee3af1a4c1 100644
> --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
> +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
> @@ -72,15 +72,12 @@
>  		stdout-path = "serial0:115200n8";
>  	};
>  
> -	clocks {
> -		/* Fixed crystal dedicated to mcp251x */
> -		clk16m: clk at 1 {
> -			compatible = "fixed-clock";
> -			reg = <1>;
> -			#clock-cells = <0>;
> -			clock-frequency = <16000000>;
> -			clock-output-names = "clk16m";
> -		};
> +	/* Fixed crystal dedicated to mcp251x */
> +	clk16m: clock-16m {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <16000000>;
> +		clock-output-names = "clk16m";
>  	};
>  
>  	gpio-keys {
> diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
> index d0e7dab4d72b..d3cba09be0cb 100644
> --- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi
> +++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
> @@ -43,13 +43,10 @@
>  #include "imx6q-ba16.dtsi"
>  
>  / {
> -	clocks {
> -		mclk: clock at 0 {
> -			compatible = "fixed-clock";
> -			reg = <0>;
> -			#clock-cells = <0>;
> -			clock-frequency = <22000000>;
> -		};
> +	mclk: clock-mclk {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <22000000>;
>  	};
>  
>  	gpio-poweroff {


Lothar Wa?mann

Re: [PATCH 3/4] ARM: dts: imx27: use lable to override osc26m clock setting

[Fabio Estevam]

Hi Shawn,

On Thu, May 3, 2018 at 9:57 PM, Shawn Guo <shawnguo@kernel.org> wrote:
> Instead of copying the whole node hierarchy, let's define a label for
> clock osc26m in soc dtsi and use it for overriding clock-frequency.
>
> Signed-off-by: Shawn Guo <shawnguo@kernel.org>

In the Subject: s/lable/label

Other than that the series looks good.

[PATCH 3/4] ARM: dts: imx27: use lable to override osc26m clock setting

[Fabio Estevam]

Hi Shawn,

On Thu, May 3, 2018 at 9:57 PM, Shawn Guo <shawnguo@kernel.org> wrote:
> Instead of copying the whole node hierarchy, let's define a label for
> clock osc26m in soc dtsi and use it for overriding clock-frequency.
>
> Signed-off-by: Shawn Guo <shawnguo@kernel.org>

In the Subject: s/lable/label

Other than that the series looks good.

Re: [PATCH 3/4] ARM: dts: imx27: use lable to override osc26m clock setting

[Shawn Guo]

On Fri, May 04, 2018 at 12:34:29PM -0300, Fabio Estevam wrote:
> Hi Shawn,
> 
> On Thu, May 3, 2018 at 9:57 PM, Shawn Guo <shawnguo@kernel.org> wrote:
> > Instead of copying the whole node hierarchy, let's define a label for
> > clock osc26m in soc dtsi and use it for overriding clock-frequency.
> >
> > Signed-off-by: Shawn Guo <shawnguo@kernel.org>
> 
> In the Subject: s/lable/label

Fixed.  Thanks, Fabio.

Shawn

[PATCH 3/4] ARM: dts: imx27: use lable to override osc26m clock setting

[Shawn Guo]

On Fri, May 04, 2018 at 12:34:29PM -0300, Fabio Estevam wrote:
> Hi Shawn,
> 
> On Thu, May 3, 2018 at 9:57 PM, Shawn Guo <shawnguo@kernel.org> wrote:
> > Instead of copying the whole node hierarchy, let's define a label for
> > clock osc26m in soc dtsi and use it for overriding clock-frequency.
> >
> > Signed-off-by: Shawn Guo <shawnguo@kernel.org>
> 
> In the Subject: s/lable/label

Fixed.  Thanks, Fabio.

Shawn