Skip to content

Commit f315050

Browse files
jbrun3tkhilman
authored andcommitted
arm64: dts: meson: kvim3: move hdmi to tdm a
The tdmout b is physically routed to the 40 pin header and the tdmout c is routed to the m2 connector. It makes these interfaces poor candidates to handle the HDMI 8ch i2s link (2ch i2s * 4 lanes) as it would force the same link format on the related connectors. Instead use the TDM A interface. This one is not routed to the outside world on the vim3, so it can only be used for HDMI. Signed-off-by: Jerome Brunet <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 75800d7 commit f315050

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
sound {
5252
compatible = "amlogic,axg-sound-card";
5353
model = "G12B-KHADAS-VIM3";
54-
audio-aux-devs = <&tdmout_b>;
55-
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
56-
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
57-
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
58-
"TDM_B Playback", "TDMOUT_B OUT";
54+
audio-aux-devs = <&tdmout_a>;
55+
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
56+
"TDMOUT_A IN 1", "FRDDR_B OUT 0",
57+
"TDMOUT_A IN 2", "FRDDR_C OUT 0",
58+
"TDM_A Playback", "TDMOUT_A OUT";
5959

6060
assigned-clocks = <&clkc CLKID_MPLL2>,
6161
<&clkc CLKID_MPLL0>,
@@ -80,7 +80,7 @@
8080

8181
/* 8ch hdmi interface */
8282
dai-link-3 {
83-
sound-dai = <&tdmif_b>;
83+
sound-dai = <&tdmif_a>;
8484
dai-format = "i2s";
8585
dai-tdm-slot-tx-mask-0 = <1 1>;
8686
dai-tdm-slot-tx-mask-1 = <1 1>;
@@ -89,7 +89,7 @@
8989
mclk-fs = <256>;
9090

9191
codec {
92-
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
92+
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
9393
};
9494
};
9595

@@ -178,11 +178,11 @@
178178
status = "okay";
179179
};
180180

181-
&tdmif_b {
181+
&tdmif_a {
182182
status = "okay";
183183
};
184184

185-
&tdmout_b {
185+
&tdmout_a {
186186
status = "okay";
187187
};
188188

0 commit comments

Comments
 (0)