| Message ID | 20240730210030.2150467-2-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5b92ca4b2368dd991f5fd242c0cf1d5a40c07c48 |
| Headers | show |
| Series | arm: dts: arm: versatile-ab: Fix duplicate clock node name | expand |
On 7/30/24 14:00, Rob Herring (Arm) 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). > > Fixes: 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames") > Reported-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Tested-by: Guenter Roeck <linux@roeck-us.net> > --- > Arnd, I imagine you can take this directly. > > arch/arm/boot/dts/arm/versatile-ab.dts | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/arm/versatile-ab.dts b/arch/arm/boot/dts/arm/versatile-ab.dts > index 6fe6b49f5d8e..635ab9268899 100644 > --- a/arch/arm/boot/dts/arm/versatile-ab.dts > +++ b/arch/arm/boot/dts/arm/versatile-ab.dts > @@ -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>;
On Tue, Jul 30, 2024 at 11:01 PM Rob Herring (Arm) <robh@kernel.org> 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). > > Fixes: 04f08ef291d4 ("arm/arm64: dts: arm: Use generic clock and regulator nodenames") > Reported-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Oh excellent, thanks. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Hello: This patch was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <arnd@arndb.de>: 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!
diff --git a/arch/arm/boot/dts/arm/versatile-ab.dts b/arch/arm/boot/dts/arm/versatile-ab.dts index 6fe6b49f5d8e..635ab9268899 100644 --- a/arch/arm/boot/dts/arm/versatile-ab.dts +++ b/arch/arm/boot/dts/arm/versatile-ab.dts @@ -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>;
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") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Rob Herring (Arm) <robh@kernel.org> --- Arnd, I imagine you can take this directly. arch/arm/boot/dts/arm/versatile-ab.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)