arm64: dts: amlogic: setup hdmi system clock

HDMI Tx needs the system clock set on the xtal rate.
This clock is managed by the main clock controller of the related SoCs.

Currently 2 part of the display drivers race to setup the HDMI system
clock by directly poking the controller register. The clock API should
be used to setup the rate instead.

Use assigned-clock to setup the HDMI system clock.

Fixes: 6939db7e0dbf ("ARM64: dts: meson-gx: Add support for HDMI output")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20240626152733.1350376-3-jbrunet@baylibre.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 4057ee808a582521b9b09efe56752ccdcd5da0e4..d08c97797010d61bbccf7c7a38199beaf9004b43 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -215,6 +215,11 @@
                                #sound-dai-cells = <0>;
                                status = "disabled";
 
+                               assigned-clocks = <&clkc CLKID_HDMI_SEL>,
+                                                 <&clkc CLKID_HDMI>;
+                               assigned-clock-parents = <&xtal>, <0>;
+                               assigned-clock-rates = <0>, <24000000>;
+
                                /* VPU VENC Input */
                                hdmi_tx_venc_port: port@0 {
                                        reg = <0>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 041c37b809f276e9ce3710423740e40a6eecd6a0..ed00e67e6923a0392acb776e886f848e9522c983 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -316,6 +316,11 @@
                 <&clkc CLKID_GCLK_VENCI_INT0>;
        clock-names = "isfr", "iahb", "venci";
        power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
+
+       assigned-clocks = <&clkc CLKID_HDMI_SEL>,
+                         <&clkc CLKID_HDMI>;
+       assigned-clock-parents = <&xtal>, <0>;
+       assigned-clock-rates = <0>, <24000000>;
 };
 
 &sysctrl {

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 067108800a58dec4b03c224f4df99eab069cf454..f58d1790de1cb438cb6c4530648b0a5840f76995 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -328,6 +328,11 @@
                 <&clkc CLKID_GCLK_VENCI_INT0>;
        clock-names = "isfr", "iahb", "venci";
        power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
+
+       assigned-clocks = <&clkc CLKID_HDMI_SEL>,
+                         <&clkc CLKID_HDMI>;
+       assigned-clock-parents = <&xtal>, <0>;
+       assigned-clock-rates = <0>, <24000000>;
 };
 
 &sysctrl {