Commit 43ffb528 authored by Jerome Brunet's avatar Jerome Brunet Committed by Neil Armstrong
Browse files

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: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20210429084253.59692-1-jbrunet@baylibre.com
parent 6efb943b

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

+37 −4
Original line number Diff line number Diff line
@@ -171,11 +171,16 @@ 
	sound {

		compatible = "amlogic,axg-sound-card";

		model = "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 0", "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";

};

arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,19 @@ 
		regulator-boot-on;

		regulator-always-on;

	};



	sound {

		model = "G12B-KHADAS-VIM3L";

		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",

				"TDMIN_A IN 0", "TDM_A Capture",

				"TDMIN_A IN 13", "TDM_A Loopback",

				"TODDR_A IN 0", "TDMIN_A OUT",

				"TODDR_B IN 0", "TDMIN_A OUT",

				"TODDR_C IN 0", "TDMIN_A OUT";

	};

};



&cpu0 {