104 lines
2.4 KiB
Diff
104 lines
2.4 KiB
Diff
From 8a50ed513979ecde63a49d0aaa71c302ac537980 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Fri, 4 Dec 2020 16:23:55 +0100
|
|
Subject: [PATCH 10/88] FROMGIT: arm64: dts: meson: vim3: enable hdmi audio
|
|
loopback
|
|
|
|
Enable audio capture frontends and a tdm decoder.
|
|
This makes it possible to loopback the audio played on the hdmi codec,
|
|
which is the only output interface at the moment.
|
|
|
|
Of course, one TODDR device would be enough to do that but since
|
|
the 3 FRDDRs are enabled on the playback side, let's do the same on the
|
|
capture side.
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
.../boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +++++++++++++++++--
|
|
1 file changed, 37 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
|
|
index d3b25163b421..4e4c2f924486 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
|
|
@@ -171,11 +171,16 @@
|
|
sound {
|
|
compatible = "amlogic,axg-sound-card";
|
|
model = "G12B-KHADAS-VIM3";
|
|
- audio-aux-devs = <&tdmout_a>;
|
|
+ audio-aux-devs = <&tdmin_a>, <&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";
|
|
+ "TDM_A Playback", "TDMOUT_A OUT",
|
|
+ "TDMIN_A IN 1", "TDM_A Capture",
|
|
+ "TDMIN_A IN 3", "TDM_A Loopback",
|
|
+ "TODDR_A IN 0", "TDMIN_A OUT",
|
|
+ "TODDR_B IN 0", "TDMIN_A OUT",
|
|
+ "TODDR_C IN 0", "TDMIN_A OUT";
|
|
|
|
assigned-clocks = <&clkc CLKID_MPLL2>,
|
|
<&clkc CLKID_MPLL0>,
|
|
@@ -198,8 +203,20 @@
|
|
sound-dai = <&frddr_c>;
|
|
};
|
|
|
|
- /* 8ch hdmi interface */
|
|
dai-link-3 {
|
|
+ sound-dai = <&toddr_a>;
|
|
+ };
|
|
+
|
|
+ dai-link-4 {
|
|
+ sound-dai = <&toddr_b>;
|
|
+ };
|
|
+
|
|
+ dai-link-5 {
|
|
+ sound-dai = <&toddr_c>;
|
|
+ };
|
|
+
|
|
+ /* 8ch hdmi interface */
|
|
+ dai-link-6 {
|
|
sound-dai = <&tdmif_a>;
|
|
dai-format = "i2s";
|
|
dai-tdm-slot-tx-mask-0 = <1 1>;
|
|
@@ -214,7 +231,7 @@
|
|
};
|
|
|
|
/* hdmi glue */
|
|
- dai-link-4 {
|
|
+ dai-link-7 {
|
|
sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
|
|
|
|
codec {
|
|
@@ -454,10 +471,26 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&tdmin_a {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&tdmout_a {
|
|
status = "okay";
|
|
};
|
|
|
|
+&toddr_a {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&toddr_b {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&toddr_c {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&tohdmitx {
|
|
status = "okay";
|
|
};
|
|
--
|
|
2.17.1
|
|
|