arm64: dts: amlogic: add power domain to hdmitx

[ Upstream commit f1ab099d6591a353899a2ee09c89de0fc908e2d2 ]

HDMI Tx needs HDMI Tx memory power domain turned on. This power domain is
handled under the VPU power domain.

The HDMI Tx currently works because it is enabling the PD by directly
poking the power controller register. It is should not do that but properly
use the power domain controller.

Fix this by adding the power domain to HDMI Tx.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20240625145017.1003346-3-jbrunet@baylibre.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Stable-dep-of: 1443b6ea806d ("arm64: dts: amlogic: setup hdmi system clock")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
index e732df3f3114d7d8a9d7a898a631405218dac76e..664912d1beaab7ddc88097c3dc1ac10bda3aafcf 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
@@ -363,6 +363,10 @@
        power-domains = <&pwrc PWRC_G12A_ETH_ID>;
 };
 
+&hdmi_tx {
+       power-domains = <&pwrc PWRC_G12A_VPU_ID>;
+};
+
 &vpu {
        power-domains = <&pwrc PWRC_G12A_VPU_ID>;
 };

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index a15c1ef30a88b50fbd4311408db0b0d3cfb8a285..041c37b809f276e9ce3710423740e40a6eecd6a0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -315,6 +315,7 @@
                 <&clkc CLKID_HDMI_PCLK>,
                 <&clkc CLKID_GCLK_VENCI_INT0>;
        clock-names = "isfr", "iahb", "venci";
+       power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
 };
 
 &sysctrl {

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index a53b38045b3d2a8ea605ce42078801015dde9a6f..067108800a58dec4b03c224f4df99eab069cf454 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -327,6 +327,7 @@
                 <&clkc CLKID_HDMI_PCLK>,
                 <&clkc CLKID_GCLK_VENCI_INT0>;
        clock-names = "isfr", "iahb", "venci";
+       power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
 };
 
 &sysctrl {

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
index fcaa1a273829c69533a3733115a1628e16d4d572..13e742ba00bea05bd001c118b9f29ccea4348bc6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -518,6 +518,10 @@
                     "amlogic,meson-gpio-intc";
 };
 
+&hdmi_tx {
+       power-domains = <&pwrc PWRC_SM1_VPU_ID>;
+};
+
 &pcie {
        power-domains = <&pwrc PWRC_SM1_PCIE_ID>;
 };