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

Commit 7376c8de authored by Laxminath Kasam's avatar Laxminath Kasam Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: update machine driver for quaternary mi2s interface 



In startup and shutdown, we do not need to check for ext-pa
property for quaternary interface. Ensure startup and shutdown is
executed for quaternary interface.

CRs-Fixed: 978548
Change-Id: Ie04a67bbad84d13ebfdb14e51ca7480004b380b7
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent 424ba5c3

sound/soc/msm/msm8952-slimbus.c

+37 −45
Original line number Diff line number Diff line
@@ -1600,7 +1600,6 @@ void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 
	pr_debug("%s(): substream = %s  stream = %d, ext_pa = %d\n", __func__,

		 substream->name, substream->stream, pdata->ext_pa);



	if (((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID)) {

	ret = quat_mi2s_clk_ctl(substream, false);

	if (ret < 0)

		pr_err("%s:clock disable failed\n", __func__);
@@ -1613,7 +1612,6 @@ void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 
		return;

	}

}

}



int msm_prim_auxpcm_startup(struct snd_pcm_substream *substream)

{
@@ -1674,7 +1672,6 @@ int msm_quat_mi2s_snd_startup(struct snd_pcm_substream *substream) 
	pr_debug("%s(): substream = %s  stream = %d\n", __func__,

		 substream->name, substream->stream);



	if (((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID)) {

	/* Configure mux for quaternary i2s */

	if (pdata->vaddr_gpio_mux_mic_ctl) {

		val = ioread32(pdata->vaddr_gpio_mux_mic_ctl);
@@ -1693,9 +1690,6 @@ int msm_quat_mi2s_snd_startup(struct snd_pcm_substream *substream) 
				__func__);

		goto err;

	}

	} else {

		pr_err("%s: error codec type\n", __func__);

	}



	if (atomic_inc_return(&pdata->clk_ref.quat_mi2s_clk_ref) == 1) {

		ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBS_CFS);
@@ -1761,7 +1755,6 @@ void msm_quin_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 


	pr_debug("%s(): substream = %s  stream = %d\n", __func__,

				substream->name, substream->stream);

	if ((pdata->ext_pa & QUIN_MI2S_ID) == QUIN_MI2S_ID) {

	ret = quin_mi2s_sclk_ctl(substream, false);

	if (ret < 0)

		pr_err("%s:clock disable failed\n", __func__);
@@ -1774,7 +1767,6 @@ void msm_quin_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 
		return;

	}

}

}



static int msm8952_wcd93xx_codec_up(struct snd_soc_codec *codec)

{

sound/soc/msm/msm8952.c

+34 −48
Original line number Diff line number Diff line
@@ -1349,7 +1349,6 @@ static int msm_quat_mi2s_snd_startup(struct snd_pcm_substream *substream) 


	pr_debug("%s(): substream = %s  stream = %d\n", __func__,

				substream->name, substream->stream);

	if ((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID) {

	if (pdata->vaddr_gpio_mux_mic_ctl) {

		val = ioread32(pdata->vaddr_gpio_mux_mic_ctl);

		val = val | 0x02020002;
@@ -1365,9 +1364,6 @@ static int msm_quat_mi2s_snd_startup(struct snd_pcm_substream *substream) 
		pr_err("failed to enable codec gpios\n");

		goto err;

	}

	} else {

			pr_err("%s: error codec type\n", __func__);

	}

	if (atomic_inc_return(&quat_mi2s_clk_ref) == 1) {

		ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBS_CFS);

		if (ret < 0)
@@ -1384,13 +1380,9 @@ err: 
static void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream)

{

	int ret;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_card *card = rtd->card;

	struct msm8916_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);



	pr_debug("%s(): substream = %s  stream = %d\n", __func__,

				substream->name, substream->stream);

	if ((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID) {

	ret = msm_mi2s_sclk_ctl(substream, false);

	if (ret < 0)

		pr_err("%s:clock disable failed\n", __func__);
@@ -1403,7 +1395,6 @@ static void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 
		return;

	}

}

}



static int msm_quin_mi2s_snd_startup(struct snd_pcm_substream *substream)

{
@@ -1449,13 +1440,9 @@ err: 
static void msm_quin_mi2s_snd_shutdown(struct snd_pcm_substream *substream)

{

	int ret;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_card *card = rtd->card;

	struct msm8916_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);



	pr_debug("%s(): substream = %s  stream = %d\n", __func__,

				substream->name, substream->stream);

	if ((pdata->ext_pa & QUIN_MI2S_ID) == QUIN_MI2S_ID) {

	ret = msm_mi2s_sclk_ctl(substream, false);

	if (ret < 0)

		pr_err("%s:clock disable failed\n", __func__);
@@ -1468,7 +1455,6 @@ static void msm_quin_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 
		return;

	}

}

}



static void *def_msm8952_wcd_mbhc_cal(void)

{