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

Commit 7b81c44f 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: Add compress sound path support for SDX20"

parents 00f79ef2 1b278986

arch/arm/boot/dts/qcom/mdm9650.dtsi

+8 −2
Original line number Diff line number Diff line
@@ -1080,12 +1080,13 @@ 
		qcom,auxpcm-interface-mode = "pri_pcm_master", "sec_pcm_master";

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

				<&loopback>, <&hostless>, <&afe>, <&routing>,

				<&pcm_dtmf>, <&host_pcm>;

				<&pcm_dtmf>, <&host_pcm>, <&compress>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-voip-dsp", "msm-pcm-voice",

				"msm-pcm-loopback", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-pcm-routing",

				"msm-pcm-dtmf", "msm-voice-host-pcm";

				"msm-pcm-dtmf", "msm-voice-host-pcm",

				"msm-compress-dsp";

		asoc-cpu = <&dai_pri_auxpcm>, <&mi2s_prim>, <&mi2s_sec>,

				<&dtmf_tx>,

				<&rx_capture_tx>, <&rx_playback_rx>,
@@ -1175,6 +1176,11 @@ 
		compatible = "qcom,msm-pcm-loopback";

	};



	compress: qcom,msm-compress-dsp {

		compatible = "qcom,msm-compress-dsp";

		qcom,adsp-version = "MDSP 1.2";

	};



	qcom,msm-dai-stub {

		compatible = "qcom,msm-dai-stub";

		dtmf_tx: qcom,msm-dai-stub-dtmf-tx {

arch/arm/boot/dts/qcom/sdx20.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ 
		};

	};



	compress: qcom,msm-compress-dsp {

		compatible = "qcom,msm-compress-dsp";

		qcom,adsp-version = "MDSP 2.8";

	};



	ipa_hw: qcom,ipa@07B00000 {

		qcom,ipa-hw-ver = <12>; /* IPA core version = IPAv3.5 */

		/delete-property/qcom,use-rg10-limitation-mitigation;

sound/soc/msm/mdm9650.c

+17 −0
Original line number Diff line number Diff line
@@ -1456,6 +1456,23 @@ static struct snd_soc_dai_link mdm_dai[] = { 
		.codec_dai_name = "msm-stub-tx",

		.ignore_suspend = 1,

	},

	{

		.name = "MDM Compress1",

		.stream_name = "COMPR",

		.cpu_dai_name = "MultiMedia4",

		.platform_name = "msm-compress-dsp",

		.dynamic = 1,

		.async_ops = ASYNC_DPCM_SND_SOC_HW_PARAMS,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA4,

	},

	{

		.name = "CS-VOICE HOST RX CAPTURE",

		.stream_name = "CS-VOICE HOST RX CAPTURE",