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

Commit 30aa70d8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: afe loopback support for msm8952"

parents d5db5c63 0a2c0270

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

+6 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -262,6 +262,11 @@ 
			qcom,msm-dai-q6-dev-id = <240>;

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

		};

		};





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

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

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

		};



		incall_record_rx: qcom,msm-dai-q6-incall-record-rx {

		incall_record_rx: qcom,msm-dai-q6-incall-record-rx {

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

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

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

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

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -82,6 +82,8 @@ 
		qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;

		qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;

		qcom,quin-mi2s-gpios = <&cdc_quin_mi2s_gpios>;

		qcom,quin-mi2s-gpios = <&cdc_quin_mi2s_gpios>;





		qcom,afe-rxtx-lb;



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

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

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

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

				<&afe>, <&lsm>, <&routing>, <&pcm_noirq>;

				<&afe>, <&lsm>, <&routing>, <&pcm_noirq>;
@@ -102,7 +104,8 @@ 
			<&afe_pcm_rx>, <&afe_pcm_tx>,

			<&afe_pcm_rx>, <&afe_pcm_tx>,

			<&afe_proxy_rx>, <&afe_proxy_tx>,

			<&afe_proxy_rx>, <&afe_proxy_tx>,

			<&incall_record_rx>, <&incall_record_tx>,

			<&incall_record_rx>, <&incall_record_tx>,

			<&incall_music_rx>, <&incall_music_2_rx>;

			<&incall_music_rx>, <&incall_music_2_rx>,

			<&afe_loopback_tx>;





		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

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

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
@@ -117,7 +120,8 @@ 
				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770";

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

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





		asoc-codec = <&stub_codec>, <&msm_digital_codec>,

		asoc-codec = <&stub_codec>, <&msm_digital_codec>,

				<&pmic_analog_codec>;

				<&pmic_analog_codec>;