arm64: dts: amlogic: gx: correct hdmi clocks

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>

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index d8a386c319142f2a795d7cd86ab504b3def617cd..041c37b809f276e9ce3710423740e40a6eecd6a0 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";
        power-domains = <&pwrc PWRC_GXBB_VPU_ID>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 82386feb517759e8f9879c36ea705d86b4e18419..067108800a58dec4b03c224f4df99eab069cf454 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";
        power-domains = <&pwrc PWRC_GXBB_VPU_ID>;