[PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[Linus Walleij]

From: "Rob Herring (Arm)" <robh@kernel.org>

There's not much reason to have multiple fixed-factor-clock instances
which are all the same factor and clock input. Drop the nodes, but keep
the labels to minimize the changes and keep some distinction of the
different clocks.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/20240528191536.1444649-1-robh@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
SoC maintainers: please apply this directly for v6.11.
---
 arch/arm/boot/dts/arm/arm-realview-eb.dtsi    | 42 +--------------------------
 arch/arm/boot/dts/arm/arm-realview-pb1176.dts | 34 +---------------------
 arch/arm/boot/dts/arm/arm-realview-pb11mp.dts | 42 +--------------------------
 arch/arm/boot/dts/arm/arm-realview-pbx.dtsi   | 42 +--------------------------
 arch/arm/boot/dts/arm/integratorap.dts        | 10 +------
 arch/arm/boot/dts/arm/mps2.dtsi               | 34 +---------------------
 6 files changed, 6 insertions(+), 198 deletions(-)

diff --git a/arch/arm/boot/dts/arm/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm/arm-realview-eb.dtsi
index fbb2258b451f..ed3ed5a4f0f7 100644
--- a/arch/arm/boot/dts/arm/arm-realview-eb.dtsi
+++ b/arch/arm/boot/dts/arm/arm-realview-eb.dtsi
@@ -53,7 +53,7 @@ vmmc: fixedregulator@0 {
 		regulator-boot-on;
         };
 
-	xtal24mhz: xtal24mhz@24M {
+	xtal24mhz: mclk: kmiclk: sspclk: uartclk: wdogclk: clock-24000000 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 		clock-frequency = <24000000>;
@@ -67,46 +67,6 @@ timclk: timclk@1M {
 		clocks = <&xtal24mhz>;
 	};
 
-	mclk: mclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	kmiclk: kmiclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	sspclk: sspclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	uartclk: uartclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	wdogclk: wdogclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
 	/* FIXME: this actually hangs off the PLL clocks */
 	pclk: pclk@0 {
 		#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/arm/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm/arm-realview-pb1176.dts
index d99bac02232b..ab2c9b71da69 100644
--- a/arch/arm/boot/dts/arm/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm/arm-realview-pb1176.dts
@@ -63,7 +63,7 @@ veth: regulator-veth {
 		regulator-boot-on;
 	};
 
-	xtal24mhz: xtal24mhz@24M {
+	xtal24mhz: mclk: kmiclk: sspclk: uartclk: clock-24000000 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 		clock-frequency = <24000000>;
@@ -77,38 +77,6 @@ timclk: timclk@1M {
 		clocks = <&xtal24mhz>;
 	};
 
-	mclk: mclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	kmiclk: kmiclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	sspclk: sspclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	uartclk: uartclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
 	/* FIXME: this actually hangs off the PLL clocks */
 	pclk: pclk@0 {
 		#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/arm/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm/arm-realview-pb11mp.dts
index 89103d54ecc1..a4c2d96aa5c8 100644
--- a/arch/arm/boot/dts/arm/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm/arm-realview-pb11mp.dts
@@ -163,7 +163,7 @@ veth: regulator-veth {
 		regulator-boot-on;
 	};
 
-	xtal24mhz: xtal24mhz@24M {
+	xtal24mhz: mclk: kmiclk: sspclk: uartclk: wdogclk: clock-24000000 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 		clock-frequency = <24000000>;
@@ -183,46 +183,6 @@ timclk: timclk@1M {
 		clocks = <&xtal24mhz>;
 	};
 
-	mclk: mclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	kmiclk: kmiclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	sspclk: sspclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	uartclk: uartclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	wdogclk: wdogclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
 	/* FIXME: this actually hangs off the PLL clocks */
 	pclk: pclk@0 {
 		#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/arm/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm/arm-realview-pbx.dtsi
index ec1507c5147c..61dbe041c69b 100644
--- a/arch/arm/boot/dts/arm/arm-realview-pbx.dtsi
+++ b/arch/arm/boot/dts/arm/arm-realview-pbx.dtsi
@@ -62,7 +62,7 @@ veth: regulator-veth {
 		regulator-boot-on;
 	};
 
-	xtal24mhz: xtal24mhz@24M {
+	xtal24mhz: mclk: kmiclk: sspclk: uartclk: wdogclk: clock-24000000 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 		clock-frequency = <24000000>;
@@ -82,46 +82,6 @@ timclk: timclk@1M {
 		clocks = <&xtal24mhz>;
 	};
 
-	mclk: mclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	kmiclk: kmiclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	sspclk: sspclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	uartclk: uartclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
-	wdogclk: wdogclk@24M {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
 	/* FIXME: this actually hangs off the PLL clocks */
 	pclk: pclk@0 {
 		#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/arm/integratorap.dts b/arch/arm/boot/dts/arm/integratorap.dts
index d9927d3181dc..27498e0f93f6 100644
--- a/arch/arm/boot/dts/arm/integratorap.dts
+++ b/arch/arm/boot/dts/arm/integratorap.dts
@@ -57,20 +57,12 @@ chosen {
 	};
 
 	/* 24 MHz chrystal on the Integrator/AP development board */
-	xtal24mhz: xtal24mhz@24M {
+	xtal24mhz: pclk: clock-24000000 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 		clock-frequency = <24000000>;
 	};
 
-	pclk: pclk@0 {
-		#clock-cells = <0>;
-		compatible = "fixed-factor-clock";
-		clock-div = <1>;
-		clock-mult = <1>;
-		clocks = <&xtal24mhz>;
-	};
-
 	/* The UART clock is 14.74 MHz divided by an ICS525 */
 	uartclk: uartclk@14.74M {
 		#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/arm/mps2.dtsi b/arch/arm/boot/dts/arm/mps2.dtsi
index ce308820765b..d930168fbd91 100644
--- a/arch/arm/boot/dts/arm/mps2.dtsi
+++ b/arch/arm/boot/dts/arm/mps2.dtsi
@@ -78,7 +78,7 @@ spicfgclk: clk-spicfg {
 		clock-frequency = <75000000>;
 	};
 
-	sysclk: clk-sys {
+	sysclk: spiclcd: spicon: i2cclcd: i2caud: clock-sys {
 		compatible = "fixed-factor-clock";
 		clocks = <&oscclk0>;
 		#clock-cells = <0>;
@@ -102,38 +102,6 @@ audsclk: clk-auds {
 		clock-mult = <1>;
 	};
 
-	spiclcd: clk-cpiclcd {
-		compatible = "fixed-factor-clock";
-		clocks = <&oscclk0>;
-		#clock-cells = <0>;
-		clock-div = <2>;
-		clock-mult = <1>;
-	};
-
-	spicon: clk-spicon {
-		compatible = "fixed-factor-clock";
-		clocks = <&oscclk0>;
-		#clock-cells = <0>;
-		clock-div = <2>;
-		clock-mult = <1>;
-	};
-
-	i2cclcd: clk-i2cclcd {
-		compatible = "fixed-factor-clock";
-		clocks = <&oscclk0>;
-		#clock-cells = <0>;
-		clock-div = <2>;
-		clock-mult = <1>;
-	};
-
-	i2caud: clk-i2caud {
-		compatible = "fixed-factor-clock";
-		clocks = <&oscclk0>;
-		#clock-cells = <0>;
-		clock-div = <2>;
-		clock-mult = <1>;
-	};
-
 	soc {
 		compatible = "simple-bus";
 		ranges;

---
base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
change-id: 20240627-arm-dts-fixes-d76332dec07d

Best regards,
-- 
Linus Walleij <linus.walleij@linaro.org>

Re: [PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[Rob Herring]

On Thu, Jun 27, 2024 at 1:57 PM Linus Walleij <linus.walleij@linaro.org> wrote:
>
> From: "Rob Herring (Arm)" <robh@kernel.org>
>
> There's not much reason to have multiple fixed-factor-clock instances
> which are all the same factor and clock input. Drop the nodes, but keep
> the labels to minimize the changes and keep some distinction of the
> different clocks.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> Link: https://lore.kernel.org/20240528191536.1444649-1-robh@kernel.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> SoC maintainers: please apply this directly for v6.11.

Maybe not. This is a dependency for patch 2 in the series[1].

Rob

[1] https://lore.kernel.org/all/20240528191536.1444649-2-robh@kernel.org/

Re: [PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[Linus Walleij]

On Fri, Jun 28, 2024 at 4:38 PM Rob Herring <robh@kernel.org> wrote:
> On Thu, Jun 27, 2024 at 1:57 PM Linus Walleij <linus.walleij@linaro.org> wrote:
> >
> > From: "Rob Herring (Arm)" <robh@kernel.org>
> >
> > There's not much reason to have multiple fixed-factor-clock instances
> > which are all the same factor and clock input. Drop the nodes, but keep
> > the labels to minimize the changes and keep some distinction of the
> > different clocks.
> >
> > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> > Link: https://lore.kernel.org/20240528191536.1444649-1-robh@kernel.org
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > ---
> > SoC maintainers: please apply this directly for v6.11.
>
> Maybe not. This is a dependency for patch 2 in the series[1].

Aha sorry for missing that :(

Sudeep, are you fine with patch 2/2? Then I can send that
the same way so Arnd can pick it up and pile it on top.

Yours,
Linus Walleij

Re: [PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[Sudeep Holla]

On Fri, Jun 28, 2024 at 11:51:02PM +0200, Linus Walleij wrote:
> On Fri, Jun 28, 2024 at 4:38 PM Rob Herring <robh@kernel.org> wrote:
> > On Thu, Jun 27, 2024 at 1:57 PM Linus Walleij <linus.walleij@linaro.org> wrote:
> > >
> > > From: "Rob Herring (Arm)" <robh@kernel.org>
> > >
> > > There's not much reason to have multiple fixed-factor-clock instances
> > > which are all the same factor and clock input. Drop the nodes, but keep
> > > the labels to minimize the changes and keep some distinction of the
> > > different clocks.
> > >
> > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> > > Link: https://lore.kernel.org/20240528191536.1444649-1-robh@kernel.org
> > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > > ---
> > > SoC maintainers: please apply this directly for v6.11.
> >
> > Maybe not. This is a dependency for patch 2 in the series[1].
> 
> Aha sorry for missing that :(
> 
> Sudeep, are you fine with patch 2/2? Then I can send that
> the same way so Arnd can pick it up and pile it on top.
> 

I didn't send 1/2 as well as I didn't hear back from Rob. Either we can
ask Arnd to pick both directly or either of us can a PR. Let me know if
you want me send a PR. I have added my review tag on 1/2 IIRC.

Sorry Rob, next time I will just pick to avoid any confusion.

--
Regards,
Sudeep

Re: [PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[Linus Walleij]

On Sat, Jun 29, 2024 at 5:11 PM Sudeep Holla <sudeep.holla@arm.com> wrote:

> > Sudeep, are you fine with patch 2/2? Then I can send that
> > the same way so Arnd can pick it up and pile it on top.
> >
>
> I didn't send 1/2 as well as I didn't hear back from Rob. Either we can
> ask Arnd to pick both directly or either of us can a PR. Let me know if
> you want me send a PR. I have added my review tag on 1/2 IIRC.

Thanks Sudeep, I just picked and signed off 2/2 and sent it to
SoC so things should fix themselves, hopefully.

Yours,
Linus Walleij

Re: [PATCH] arm: dts: arm: Drop redundant fixed-factor clocks

[patchwork-bot+linux-soc]

Hello:

This patch was applied to soc/soc.git (for-next)
by Arnd Bergmann <arnd@arndb.de>:

On Thu, 27 Jun 2024 21:57:38 +0200 you wrote:
> From: "Rob Herring (Arm)" <robh@kernel.org>
> 
> There's not much reason to have multiple fixed-factor-clock instances
> which are all the same factor and clock input. Drop the nodes, but keep
> the labels to minimize the changes and keep some distinction of the
> different clocks.
> 
> [...]

Here is the summary with links:
  - arm: dts: arm: Drop redundant fixed-factor clocks
    https://git.kernel.org/soc/soc/c/b1a4e71d4fc4

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html