Skip to content

Commit 1443b6e

Browse files
jbrun3tsuperna9999
authored andcommitted
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: 6939db7 ("ARM64: dts: meson-gx: Add support for HDMI output") Signed-off-by: Jerome Brunet <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Neil Armstrong <[email protected]>
1 parent 0602ba0 commit 1443b6e

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,11 @@
215215
#sound-dai-cells = <0>;
216216
status = "disabled";
217217

218+
assigned-clocks = <&clkc CLKID_HDMI_SEL>,
219+
<&clkc CLKID_HDMI>;
220+
assigned-clock-parents = <&xtal>, <0>;
221+
assigned-clock-rates = <0>, <24000000>;
222+
218223
/* VPU VENC Input */
219224
hdmi_tx_venc_port: port@0 {
220225
reg = <0>;

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,11 @@
316316
<&clkc CLKID_GCLK_VENCI_INT0>;
317317
clock-names = "isfr", "iahb", "venci";
318318
power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
319+
320+
assigned-clocks = <&clkc CLKID_HDMI_SEL>,
321+
<&clkc CLKID_HDMI>;
322+
assigned-clock-parents = <&xtal>, <0>;
323+
assigned-clock-rates = <0>, <24000000>;
319324
};
320325

321326
&sysctrl {

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,11 @@
328328
<&clkc CLKID_GCLK_VENCI_INT0>;
329329
clock-names = "isfr", "iahb", "venci";
330330
power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
331+
332+
assigned-clocks = <&clkc CLKID_HDMI_SEL>,
333+
<&clkc CLKID_HDMI>;
334+
assigned-clock-parents = <&xtal>, <0>;
335+
assigned-clock-rates = <0>, <24000000>;
331336
};
332337

333338
&sysctrl {

0 commit comments

Comments
 (0)