| Message ID | 20190108072526.2621-1-wens@csie.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | aa9ad54285c78e7f69b20b3734c0c79aa98af3c3 |
| Headers | show |
| Series | ARM: dts: sun6i: Add clock-output-names to osc24M clock | expand |
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
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 {
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(+)