Skip to contentSkip to conversation

powerpc/mpc85xx: fix issues in clock node

PATCH In review [email protected] 2 participants 4 messages Sep 11, 2018 – Sep 19, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/mpc85xx: fix issues in clock node

From: Yuantian Tang <[email protected]>

The compatible string is not correct in the clock node. The clocks property refers to the wrong node too. This patch is to fix them.

---
 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +4 -4
index 4908af5..763caf4 100644
@@ -348,7 +348,7 @@
 		mux0: mux0@0 {
 			#clock-cells = <0>;
 			reg = <0x0 4>;
-			compatible = "fsl,core-mux-clock";
+			compatible = "fsl,qoriq-core-mux-2.0";
 			clocks = <&pll0 0>, <&pll0 1>;
 			clock-names = "pll0_0", "pll0_1";
 			clock-output-names = "cmux0";
@@ -356,9 +356,9 @@
 		mux1: mux1@20 {
 			#clock-cells = <0>;
 			reg = <0x20 4>;
-			compatible = "fsl,core-mux-clock";
-			clocks = <&pll0 0>, <&pll0 1>;
-			clock-names = "pll0_0", "pll0_1";
+			compatible = "fsl,qoriq-core-mux-2.0";
+			clocks = <&pll1 0>, <&pll1 1>;
+			clock-names = "pll1_0", "pll1_1";
 			clock-output-names = "cmux1";
 		};
 	};
Signature · 1 line
1.7.1
author
#1 lore raw

Hi Scott,

Could you please take a look at this patch?

Thanks,
Andy

Quoted 49 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: 2018年9月11日 10:12
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Andy Tang <[email protected]>
Subject: [PATCH] powerpc/mpc85xx: fix issues in clock node

From: Yuantian Tang <[email protected]>

The compatible string is not correct in the clock node. The clocks property refers to the wrong node too. This patch is to fix them.

---
 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +4 -5
index 4908af5..763caf4 100644
@@ -348,7 +348,7 @@
 		mux0: mux0@0 {
 			#clock-cells = <0>;
 			reg = <0x0 4>;
-			compatible = "fsl,core-mux-clock";
+			compatible = "fsl,qoriq-core-mux-2.0";
 			clocks = <&pll0 0>, <&pll0 1>;
 			clock-names = "pll0_0", "pll0_1";
 			clock-output-names = "cmux0";
@@ -356,9 +356,9 @@
 		mux1: mux1@20 {
 			#clock-cells = <0>;
 			reg = <0x20 4>;
-			compatible = "fsl,core-mux-clock";
-			clocks = <&pll0 0>, <&pll0 1>;
-			clock-names = "pll0_0", "pll0_1";
+			compatible = "fsl,qoriq-core-mux-2.0";
+			clocks = <&pll1 0>, <&pll1 1>;
+			clock-names = "pll1_0", "pll1_1";
 			clock-output-names = "cmux1";
 		};
 	};
--

1.7.1

#2 lore raw
In reply to [email protected]
Quoted 28 lines · On Tue, 2018-09-11 at 10:12 +0800, [email protected] wrote:

From: Yuantian Tang <[email protected]>

The compatible string is not correct in the clock node. The clocks property refers to the wrong node too. This patch is to fix them.

---
 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +1 -1
index 4908af5..763caf4 100644
@@ -348,7 +348,7 @@
 		mux0: mux0@0 {
 			#clock-cells = <0>;
 			reg = <0x0 4>;
-			compatible = "fsl,core-mux-clock";
+			compatible = "fsl,qoriq-core-mux-2.0";
 			clocks = <&pll0 0>, <&pll0 1>;
 			clock-names = "pll0_0", "pll0_1";
 			clock-output-names = "cmux0";
@@ -356,9 +356,9 @@
 		mux1: mux1@20 {
 			#clock-cells = <0>;

arch/powerpc/boot/dts/fsl/t1023si-post.dtsi line 364

Quoted 10 lines
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +3 -3
 			reg = <0x20 4>;
-			compatible = "fsl,core-mux-clock";
-			clocks = <&pll0 0>, <&pll0 1>;
-			clock-names = "pll0_0", "pll0_1";
+			compatible = "fsl,qoriq-core-mux-2.0";
+			clocks = <&pll1 0>, <&pll1 1>;
+			clock-names = "pll1_0", "pll1_1";
 			clock-output-names = "cmux1";
 		};
 	};

These are the legacy nodes. Why not just remove them instead of fixing them? Now that the cpufreq driver is fixed we could get rid of the legacy nodes for all the chips.

-Scott

author
#3 lore raw

Hi Scott,

What you said makes sense well. I will resend the patch.

Thanks,
Andy

Quoted 55 lines

-----Original Message-----
From: Scott Wood <[email protected]>
Sent: 2018年9月19日 6:24
To: Andy Tang <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] powerpc/mpc85xx: fix issues in clock node

Quoted 28 lines · On Tue, 2018-09-11 at 10:12 +0800, [email protected] wrote:

From: Yuantian Tang <[email protected]>

The compatible string is not correct in the clock node. The clocks property refers to the wrong node too. This patch is to fix them.

---
 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +1 -1
index 4908af5..763caf4 100644
@@ -348,7 +348,7 @@
 		mux0: mux0@0 {
 			#clock-cells = <0>;
 			reg = <0x0 4>;
-			compatible = "fsl,core-mux-clock";
+			compatible = "fsl,qoriq-core-mux-2.0";
 			clocks = <&pll0 0>, <&pll0 1>;
 			clock-names = "pll0_0", "pll0_1";
 			clock-output-names = "cmux0";
@@ -356,9 +356,9 @@
 		mux1: mux1@20 {
 			#clock-cells = <0>;

arch/powerpc/boot/dts/fsl/t1023si-post.dtsi line 364

Quoted 10 lines
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +3 -3
 			reg = <0x20 4>;
-			compatible = "fsl,core-mux-clock";
-			clocks = <&pll0 0>, <&pll0 1>;
-			clock-names = "pll0_0", "pll0_1";
+			compatible = "fsl,qoriq-core-mux-2.0";
+			clocks = <&pll1 0>, <&pll1 1>;
+			clock-names = "pll1_0", "pll1_1";
 			clock-output-names = "cmux1";
 		};
 	};

These are the legacy nodes. Why not just remove them instead of fixing them?
Now that the cpufreq driver is fixed we could get rid of the legacy nodes for all the chips.

-Scott