mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: amlogic: gx: correct hdmi clocks

Browse Source 
[ 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: 6939db7e0d ("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>
This commit is contained in:
Jerome Brunet
2024-06-26 17:27:30 +02:00
committed by Greg Kroah-Hartman
parent 09fd5840a6
commit 870799de07
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
View File

@@ -311,8 +311,8 @@
<&reset RESET_HDMI_SYSTEM_RESET>, <&reset RESET_HDMI_SYSTEM_RESET>,
<&reset RESET_HDMI_TX>; <&reset RESET_HDMI_TX>;
reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
clocks = <&clkc CLKID_HDMI_PCLK>, clocks = <&clkc CLKID_HDMI>,
<&clkc CLKID_CLK81>, <&clkc CLKID_HDMI_PCLK>,
<&clkc CLKID_GCLK_VENCI_INT0>; <&clkc CLKID_GCLK_VENCI_INT0>;
clock-names = "isfr", "iahb", "venci"; clock-names = "isfr", "iahb", "venci";
}; };

4
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
View File

@@ -323,8 +323,8 @@
<&reset RESET_HDMI_SYSTEM_RESET>, <&reset RESET_HDMI_SYSTEM_RESET>,
<&reset RESET_HDMI_TX>; <&reset RESET_HDMI_TX>;
reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
clocks = <&clkc CLKID_HDMI_PCLK>, clocks = <&clkc CLKID_HDMI>,
<&clkc CLKID_CLK81>, <&clkc CLKID_HDMI_PCLK>,
<&clkc CLKID_GCLK_VENCI_INT0>; <&clkc CLKID_GCLK_VENCI_INT0>;
clock-names = "isfr", "iahb", "venci"; clock-names = "isfr", "iahb", "venci";
}; };