2020-07-01 09:47:48

by Jerome Brunet

Subject: [PATCH 0/2] arm64: dts: meson: odroid-n2: update sound card

This patchset adds the support for the TDM loopback and audio on the jack
output using the internal codec.

Jerome Brunet (2):
arm64: dts: meson: odroid-n2: enable audio loopback
arm64: dts: meson: odroid-n2: add jack audio output support

.../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 136 +++++++++++++++++-
1 file changed, 131 insertions(+), 5 deletions(-)

--
2.25.4

2020-07-01 09:48:48

by Jerome Brunet

Subject: [PATCH 1/2] arm64: dts: meson: odroid-n2: enable audio loopback

Add capture pcm interfaces and loopback routes to the odroid-n2

Signed-off-by: Jerome Brunet <[email protected]>
---
.../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 65 +++++++++++++++++--
1 file changed, 61 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
index 169ea283d4ee..d4421ad164bd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
@@ -209,11 +209,28 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,axg-sound-card";
model = "G12B-ODROID-N2";
- audio-aux-devs = <&tdmout_b>;
+ audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>,
+ <&tdmin_c>, <&tdmin_lb>;
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";
+ "TDM_B Playback", "TDMOUT_B OUT",
+ "TDMIN_A IN 4", "TDM_B Loopback",
+ "TDMIN_B IN 4", "TDM_B Loopback",
+ "TDMIN_C IN 4", "TDM_B Loopback",
+ "TDMIN_LB IN 1", "TDM_B Loopback",
+ "TODDR_A IN 0", "TDMIN_A OUT",
+ "TODDR_B IN 0", "TDMIN_A OUT",
+ "TODDR_C IN 0", "TDMIN_A OUT",
+ "TODDR_A IN 1", "TDMIN_B OUT",
+ "TODDR_B IN 1", "TDMIN_B OUT",
+ "TODDR_C IN 1", "TDMIN_B OUT",
+ "TODDR_A IN 2", "TDMIN_C OUT",
+ "TODDR_B IN 2", "TDMIN_C OUT",
+ "TODDR_C IN 2", "TDMIN_C OUT",
+ "TODDR_A IN 6", "TDMIN_LB OUT",
+ "TODDR_B IN 6", "TDMIN_LB OUT",
+ "TODDR_C IN 6", "TDMIN_LB OUT";

assigned-clocks = <&clkc CLKID_MPLL2>,
<&clkc CLKID_MPLL0>,
@@ -236,8 +253,20 @@ dai-link-2 {
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_b>;
dai-format = "i2s";
dai-tdm-slot-tx-mask-0 = <1 1>;
@@ -252,7 +281,7 @@ codec {
};

/* hdmi glue */
- dai-link-4 {
+ dai-link-7 {
sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;

codec {
@@ -476,6 +505,22 @@ &tdmif_b {
status = "okay";
};

+&tdmin_a {
+ status = "okay";
+};
+
+&tdmin_b {
+ status = "okay";
+};
+
+&tdmin_c {
+ status = "okay";
+};
+
+&tdmin_lb {
+ status = "okay";
+};
+
&tdmout_b {
status = "okay";
};
@@ -484,6 +529,18 @@ &tohdmitx {
status = "okay";
};

+&toddr_a {
+ status = "okay";
+};
+
+&toddr_b {
+ status = "okay";
+};
+
+&toddr_c {
+ status = "okay";
+};
+
&uart_AO {
status = "okay";
pinctrl-0 = <&uart_ao_a_pins>;
--
2.25.4

2020-08-10 22:18:57

by Kevin Hilman

Subject: Re: [PATCH 0/2] arm64: dts: meson: odroid-n2: update sound card

On Wed, 1 Jul 2020 11:45:54 +0200, Jerome Brunet wrote:
> This patchset adds the support for the TDM loopback and audio on the jack
> output using the internal codec.
>
> Jerome Brunet (2):
> arm64: dts: meson: odroid-n2: enable audio loopback
> arm64: dts: meson: odroid-n2: add jack audio output support
>
> [...]

Applied, thanks!

[1/2] arm64: dts: meson: odroid-n2: enable audio loopback
(no commit info)
[2/2] arm64: dts: meson: odroid-n2: add jack audio output support
(no commit info)

Best regards,
--
Kevin Hilman <[email protected]>