Patch "arm64: dts: allwinner: a64: explicitly assign clock parent for TCON0" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    arm64: dts: allwinner: a64: explicitly assign clock parent for TCON0

to the 6.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-dts-allwinner-a64-explicitly-assign-clock-pare.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5c6930863ed5c499e4e2fbf4c86a8f90cbdc6421
Author: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
Date:   Fri Jan 3 23:36:59 2025 -0800

    arm64: dts: allwinner: a64: explicitly assign clock parent for TCON0
    
    [ Upstream commit 8715c91a836502929c637c76a26335ede8818acf ]
    
    TCON0 seems to need a different clock parent depending on output type.
    For RGB it has to be PLL-VIDEO0-2X, while for DSI it has to be PLL-MIPI,
    so select it explicitly.
    
    Video output doesn't work if incorrect clock is assigned.
    
    On my Pinebook I manually configured PLL-VIDEO0-2X and PLL-MIPI to the same
    rate, and while video output works fine with PLL-VIDEO0-2X, it doesn't
    work at all (as in no picture) with PLL-MIPI.
    
    Fixes: ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux")
    Reviewed-by: Dragan Simic <dsimic@xxxxxxxxxxx>
    Reviewed-by: Chen-Yu Tsai <wens@xxxxxxxx>
    Tested-by: Frank Oltmanns <frank@xxxxxxxxxxxx> # on PinePhone
    Tested-by: Stuart Gathman <stuart@xxxxxxxxxxx> # on OG Pinebook
    Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
    Link: https://patch.msgid.link/20250104074035.1611136-4-anarsoul@xxxxxxxxx
    Signed-off-by: Chen-Yu Tsai <wens@xxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 379c2c8466f50..86d44349e0951 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -390,6 +390,8 @@ &sound {
 &tcon0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&lcd_rgb666_pins>;
+	assigned-clocks = <&ccu CLK_TCON0>;
+	assigned-clock-parents = <&ccu CLK_PLL_VIDEO0_2X>;
 
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
index b407e1dd08a73..ec055510af8b6 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
@@ -369,6 +369,8 @@ &sound {
 &tcon0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&lcd_rgb666_pins>;
+	assigned-clocks = <&ccu CLK_TCON0>;
+	assigned-clock-parents = <&ccu CLK_PLL_VIDEO0_2X>;
 
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index a5c3920e0f048..0fecf0abb204c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -445,6 +445,8 @@ tcon0: lcd-controller@1c0c000 {
 			clock-names = "ahb", "tcon-ch0";
 			clock-output-names = "tcon-data-clock";
 			#clock-cells = <0>;
+			assigned-clocks = <&ccu CLK_TCON0>;
+			assigned-clock-parents = <&ccu CLK_PLL_MIPI>;
 			resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>;
 			reset-names = "lcd", "lvds";