arm64: dts: amlogic: gx: correct hdmi clocks

[ Upstream commit 0602ba0dcd0e76067a0b7543e92b2de3fb231073 ]

The clocks provided to HDMI tx are not consistent between gx and g12:
* gx receives the peripheral clock as 'isfr' while g12 receives it as
  'iahb'
* g12 gets the HDMI system clock as 'isfr' but gx does not even get it.
  It surely needs that clock since the driver is directly poking around
  the clock controller's registers for that clock.

Align gx SoCs with g12 and provide:
 * the HDMI peripheral clock as 'iahb'
 * the HDMI system clock as 'isfr'

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-2-jbrunet@baylibre.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 12ef6e81c8bd63767d1a91a04c5b877ffcec088c..a15c1ef30a88b50fbd4311408db0b0d3cfb8a285 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -311,8 +311,8 @@
                 <&reset RESET_HDMI_SYSTEM_RESET>,
                 <&reset RESET_HDMI_TX>;
        reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
-       clocks = <&clkc CLKID_HDMI_PCLK>,
-                <&clkc CLKID_CLK81>,
+       clocks = <&clkc CLKID_HDMI>,
+                <&clkc CLKID_HDMI_PCLK>,
                 <&clkc CLKID_GCLK_VENCI_INT0>;
        clock-names = "isfr", "iahb", "venci";
 };

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 17bcfa4702e17075815fa3fbb37329a7b9dc79af..a53b38045b3d2a8ea605ce42078801015dde9a6f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -323,8 +323,8 @@
                 <&reset RESET_HDMI_SYSTEM_RESET>,
                 <&reset RESET_HDMI_TX>;
        reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
-       clocks = <&clkc CLKID_HDMI_PCLK>,
-                <&clkc CLKID_CLK81>,
+       clocks = <&clkc CLKID_HDMI>,
+                <&clkc CLKID_HDMI_PCLK>,
                 <&clkc CLKID_GCLK_VENCI_INT0>;
        clock-names = "isfr", "iahb", "venci";
 };