Skip to contentSkip to conversation

arm: dts: arm: versatile-ab: Fix duplicate clock node name

PATCH Applied Rob Herring (Arm) 4 participants 4 messages Jul 30, 2024 – Aug 6, 2024

Subsystems (2)
lore
Share & tools
lore

Rob Herring (Arm)

author maintainer
#0 lore raw

PATCH 1/1 arm: dts: arm: versatile-ab: Fix duplicate clock node name

Commit 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames") renamed nodes and created 2 "clock-24000000" nodes (at different paths). The kernel can't handle these duplicate names even though they are at different paths. Fix this by renaming one of the nodes to "clock-pclk". This name is aligned with other Arm boards (those didn't have a known frequency to use in the node name).

Fixes 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames")

---
Arnd, I imagine you can take this directly.

 arch/arm/boot/dts/arm/versatile-ab.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/arm/versatile-ab.dts +1 -1
index 6fe6b49f5d8e..635ab9268899 100644
@@ -157,7 +157,7 @@ timclk: clock-1000000 {
 			clocks = <&xtal24mhz>;
 		};
 
-		pclk: clock-24000000 {
+		pclk: clock-pclk {
 			#clock-cells = <0>;
 			compatible = "fixed-factor-clock";
 			clock-div = <1>;
Signature · 1 line
2.43.0
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Rob Herring (Arm)

Commit 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames") renamed nodes and created 2 "clock-24000000" nodes (at different paths). The kernel can't handle these duplicate names even though they are at different paths. Fix this by renaming one of the nodes to "clock-pclk". This name is aligned with other Arm boards (those didn't have a known frequency to use in the node name).

Fixes 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames")
Quoted 19 lines

---
Arnd, I imagine you can take this directly.

  arch/arm/boot/dts/arm/versatile-ab.dts | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/arm/versatile-ab.dts +1 -1
index 6fe6b49f5d8e..635ab9268899 100644
@@ -157,7 +157,7 @@ timclk: clock-1000000 {
  			clocks = <&xtal24mhz>;
  		};
 
-		pclk: clock-24000000 {
+		pclk: clock-pclk {
  			#clock-cells = <0>;
  			compatible = "fixed-factor-clock";
  			clock-div = <1>;
Reviewed-by Tested-by on v1 1/1
#2 lore raw
In reply to Rob Herring (Arm)
Quoted 10 lines · Rob Herring (Arm)

Commit 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames") renamed nodes and created 2 "clock-24000000" nodes (at different paths). The kernel can't handle these duplicate names even though they are at different paths. Fix this by renaming one of the nodes to "clock-pclk". This name is aligned with other Arm boards (those didn't have a known frequency to use in the node name).

Fixes 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames")

Oh excellent, thanks.

Yours,
Linus Walleij

#3 lore raw
In reply to Rob Herring (Arm)
This patch was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <[email protected]>:

Hello:

This patch was applied to soc/soc.git (arm/fixes)
by Arnd Bergmann <[email protected]>:

Quoted 8 lines · On Tue, 30 Jul 2024 15:00:30 -0600 you wrote:

Commit 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames") renamed nodes and created 2 "clock-24000000" nodes (at different paths). The kernel can't handle these duplicate names even though they are at different paths. Fix this by renaming one of the nodes to "clock-pclk". This name is aligned with other Arm boards (those didn't have a known frequency to use in the node name).

[...]

Here is the summary with links:
- arm: dts: arm: versatile-ab: Fix duplicate clock node name

    https://git.kernel.org/soc/soc/c/5b92ca4b2368

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html