[PATCH] ARM: dts: sun6i: Add clock-output-names to osc24M clock

[PATCH] ARM: dts: sun6i: Add clock-output-names to osc24M clock

[Chen-Yu Tsai]

The osc24M clock does not have a "clock-output-names" property, which
means that the clock name is derived from the node name in Linux. The
node name was changed in commit acfd5bbe2641 ("ARM: dts: sun6i: Change
clock node names to avoid warnings"). This breaks Linux as the sunxi-ng
clock driver implicitly depends on the external clock being named
"osc24M".

Add a "clock-output-names" property to restore the previous behavior.

Fixes: acfd5bbe2641 ("ARM: dts: sun6i: Change clock node names to avoid
		      warnings")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
This is a critical fix for v5.0-rc. Without it the A31 boots up to the
UART failing to get its clock rate, and thus failing to setup a console.

Also the timer-sun5i init code hits a divide by zero exception. I'll
send a separate patch to make this one fail gracefully.
---
 arch/arm/boot/dts/sun6i-a31.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 353d90f99b40..13304b8c5139 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -216,6 +216,7 @@
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <24000000>;
+			clock-output-names = "osc24M";
 		};
 
 		osc32k: clk-32k {
-- 
2.20.1


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

Re: [PATCH] ARM: dts: sun6i: Add clock-output-names to osc24M clock

[Maxime Ripard]

[-- Attachment #1.1: Type: text/plain, Size: 784 bytes --]

On Tue, Jan 08, 2019 at 03:25:26PM +0800, Chen-Yu Tsai wrote:
> The osc24M clock does not have a "clock-output-names" property, which
> means that the clock name is derived from the node name in Linux. The
> node name was changed in commit acfd5bbe2641 ("ARM: dts: sun6i: Change
> clock node names to avoid warnings"). This breaks Linux as the sunxi-ng
> clock driver implicitly depends on the external clock being named
> "osc24M".
> 
> Add a "clock-output-names" property to restore the previous behavior.
> 
> Fixes: acfd5bbe2641 ("ARM: dts: sun6i: Change clock node names to avoid
> 		      warnings")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Applied, thanks!
Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

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