743c770326
* Use latest ODROID-N2+ patches (partial #929) Use the queued patches (and fixes) for upstream ODROID-N2+ support. This uses the clock settings from meson-g12b-a311d.dtsi running the CPUs at the following clocks: - 4xA73@2.2GHz - 2xA53@1.8GHz * Actually fix CDC ACM error recovery path (#921) Remove the revert of the cool-down patch and add the actual fix for the CDC ACM error recovery path.
128 lines
3.1 KiB
Diff
128 lines
3.1 KiB
Diff
From a778ae244b9e6035ef4c0e4fb36d81f140ed5019 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <a778ae244b9e6035ef4c0e4fb36d81f140ed5019.1603880585.git.stefan@agner.ch>
|
|
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
|
|
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Mon, 15 Jun 2020 15:38:44 +0200
|
|
Subject: [PATCH 06/14] arm64: dts: meson-g12b: odroid-n2: enable audio
|
|
loopback
|
|
|
|
Add capture pcm interfaces and loopback routes to the odroid-n2
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
.../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.29.1
|
|
|