| Message ID | 20200421141814.639480-1-jbrunet@baylibre.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f31505089497ced2a640d3d883f0f690a1f0026c |
| Headers | show |
| Series | arm64: dts: meson: kvim3: move hdmi to tdm a | expand |
Jerome Brunet <jbrunet@baylibre.com> writes: > 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 <jbrunet@baylibre.com> Queued for v5.8, Kevin
Hello: This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next). On Tue, 21 Apr 2020 16:18:14 +0200 you wrote: > 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. > > [...] Here is a summary with links: - arm64: dts: meson: kvim3: move hdmi to tdm a https://git.kernel.org/khilman/linux-amlogic/c/f31505089497ced2a640d3d883f0f690a1f0026c You are awesome, thank you!
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi index c6c8caed8327..224c890d32d3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi @@ -51,11 +51,11 @@ vddcpu_b: regulator-vddcpu-b { sound { compatible = "amlogic,axg-sound-card"; model = "G12B-KHADAS-VIM3"; - audio-aux-devs = <&tdmout_b>; - audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", - "TDMOUT_B IN 1", "FRDDR_B OUT 1", - "TDMOUT_B IN 2", "FRDDR_C OUT 1", - "TDM_B Playback", "TDMOUT_B OUT"; + audio-aux-devs = <&tdmout_a>; + audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", + "TDMOUT_A IN 1", "FRDDR_B OUT 0", + "TDMOUT_A IN 2", "FRDDR_C OUT 0", + "TDM_A Playback", "TDMOUT_A OUT"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, @@ -80,7 +80,7 @@ dai-link-2 { /* 8ch hdmi interface */ dai-link-3 { - sound-dai = <&tdmif_b>; + sound-dai = <&tdmif_a>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>; dai-tdm-slot-tx-mask-1 = <1 1>; @@ -89,7 +89,7 @@ dai-link-3 { mclk-fs = <256>; codec { - sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>; }; }; @@ -182,11 +182,11 @@ &pwm_AO_cd { status = "okay"; }; -&tdmif_b { +&tdmif_a { status = "okay"; }; -&tdmout_b { +&tdmout_a { status = "okay"; };
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 <jbrunet@baylibre.com> --- .../dts/amlogic/meson-g12b-khadas-vim3.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)