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

Commit 4510b5d3 authored by Avinash Vaish's avatar Avinash Vaish Committed by Karthik Reddy Katta
Browse files

ASoC: msm8974: add devices for incall music delivery 



Add backend dai link and frond end dai link to enable
incall music delivery on the second sub.
The feature is required to play LCH tone on second sub.

CRs-Fixed: 626562
Change-Id: Ibbea1e2102ea10b2d114b8d57ff96dd09863ffa1
Signed-off-by: default avatarAvinash Vaish <avaish@codeaurora.org>
Signed-off-by: default avatarKarthik Reddy Katta <a_katta@codeaurora.org>
parent 072185c6

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

+6 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ Required properties: 
                            FM Rx and TX port ID values from 12292 to 12293

                            incall record Rx and TX port ID values from 32771 to 32772

                            inCall Music Delivery port ID is 32773

			    incall Music 2 Delivery port ID is 32770



* msm-auxpcm
@@ -432,6 +433,11 @@ Example: 
			compatible = "qcom,msm-dai-q6-dev";

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

		};



		qcom,msm-dai-q6-incall-music-2-rx {

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

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

		};

	};



	qcom,msm-pri-auxpcm {

sound/soc/msm/msm8974.c

+28 −0
Original line number Diff line number Diff line
@@ -2395,6 +2395,21 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = { 
		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM8,

	},

	{

		.name = "MSM8974 Media9",

		.stream_name = "MultiMedia9",

		.cpu_dai_name   = "MultiMedia9",

		.platform_name  = "msm-pcm-dsp.0",

		.dynamic = 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,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA9,

	},

	/* Backend BT/FM DAI Links */

	{

		.name = LPASS_BE_INT_BT_SCO_RX,
@@ -2686,6 +2701,19 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = { 
		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},

	/* Incall Music 2 BACK END DAI Link */

	{

		.name = LPASS_BE_VOICE2_PLAYBACK_TX,

		.stream_name = "Voice2 Farend Playback",

		.cpu_dai_name = "msm-dai-q6-dev.32770",

		.platform_name = "msm-pcm-routing",

		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.be_id = MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	}

};



static struct snd_soc_dai_link msm8974_hdmi_dai_link[] = {