Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f53d8e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add afe_loopback_tx BE dai for kona"

parents e0c04407 61aecd9c

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -1838,6 +1838,7 @@ Optional properties: 
- qcom,auxpcm-audio-intf: Property to specify if Aux PCM interface is used for the target

- qcom,auxpcm-audio-intf: Property to specify if Aux PCM interface is used for the target

- qcom,cdc-dmic-gpios : phandle for Digital mic clk and data gpios.

- qcom,cdc-dmic-gpios : phandle for Digital mic clk and data gpios.

- qcom,msm_audio_ssr_devs: List the snd event framework clients

- qcom,msm_audio_ssr_devs: List the snd event framework clients

- qcom,afe-rxtx-lb: AFE RX to TX loopback.





Example:

Example:

	kona_snd: sound {

	kona_snd: sound {
@@ -1847,6 +1848,7 @@ Example: 
		qcom,wcn-btfm = <1>;

		qcom,wcn-btfm = <1>;

		qcom,mi2s-audio-intf = <1>;

		qcom,mi2s-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,afe-rxtx-lb = <1>;





		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&loopback>, <&compress>, <&hostless>,

arch/arm64/boot/dts/qcom/kona-audio.dtsi

+5 −2
Original line number Original line Diff line number Diff line
@@ -71,6 +71,7 @@ 
		qcom,auxpcm-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,wcn-bt = <0>;

		qcom,wcn-bt = <0>;

		qcom,ext-disp-audio-rx = <0>;

		qcom,ext-disp-audio-rx = <0>;

		qcom,afe-rxtx-lb = <0>;





		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&loopback>, <&compress>, <&hostless>,
@@ -111,7 +112,8 @@ 
				<&rx_cdc_dma_3_rx>, <&tx_cdc_dma_3_tx>,

				<&rx_cdc_dma_3_rx>, <&tx_cdc_dma_3_tx>,

				<&rx_cdc_dma_4_rx>, <&tx_cdc_dma_4_tx>,

				<&rx_cdc_dma_4_rx>, <&tx_cdc_dma_4_tx>,

				<&rx_cdc_dma_5_rx>, <&tx_cdc_dma_5_tx>,

				<&rx_cdc_dma_5_rx>, <&tx_cdc_dma_5_tx>,

				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>;

				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>,

				<&afe_loopback_tx>;

		asoc-cpu-names = "msm-dai-q6-dp.24608",

		asoc-cpu-names = "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -151,7 +153,8 @@ 
				"msm-dai-cdc-dma-dev.45114",

				"msm-dai-cdc-dma-dev.45114",

				"msm-dai-cdc-dma-dev.45115",

				"msm-dai-cdc-dma-dev.45115",

				"msm-dai-cdc-dma-dev.45116",

				"msm-dai-cdc-dma-dev.45116",

				"msm-dai-cdc-dma-dev.45118";

				"msm-dai-cdc-dma-dev.45118",

				"msm-dai-q6-dev.24577";

		fsa4480-i2c-handle = <&fsa4480>;

		fsa4480-i2c-handle = <&fsa4480>;

	};

	};

};

};

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -643,4 +643,9 @@ 
		compatible = "qcom,msm-dai-q6-spdif";

		compatible = "qcom,msm-dai-q6-spdif";

		qcom,msm-dai-q6-dev-id = <20483>;

		qcom,msm-dai-q6-dev-id = <20483>;

	};

	};



	afe_loopback_tx: qcom,msm-dai-q6-afe-loopback-tx {

		compatible = "qcom,msm-dai-q6-dev";

		qcom,msm-dai-q6-dev-id = <24577>;

	};

};
 
};