Merge "ASoC: msm: update machine driver for quaternary mi2s interface" (cf206b9b) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8952-slimbus.c

+37 −45

Original line number	Original line	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__,		pr_debug("%s(): substream = %s stream = %d, ext_pa = %d\n", __func__,
	substream->name, substream->stream, pdata->ext_pa);		substream->name, substream->stream, pdata->ext_pa);

	if (((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID)) {
	ret = quat_mi2s_clk_ctl(substream, false);		ret = quat_mi2s_clk_ctl(substream, false);
	if (ret < 0)		if (ret < 0)
	pr_err("%s:clock disable failed\n", __func__);		pr_err("%s:clock disable failed\n", __func__);
	@@ -1613,7 +1612,6 @@ void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
	return;		return;
	}		}
	}		}
	}

	int msm_prim_auxpcm_startup(struct snd_pcm_substream *substream)		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__,		pr_debug("%s(): substream = %s stream = %d\n", __func__,
	substream->name, substream->stream);		substream->name, substream->stream);

	if (((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID)) {
	/* Configure mux for quaternary i2s */		/* Configure mux for quaternary i2s */
	if (pdata->vaddr_gpio_mux_mic_ctl) {		if (pdata->vaddr_gpio_mux_mic_ctl) {
	val = ioread32(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__);		__func__);
	goto err;		goto err;
	}		}
	} else {
	pr_err("%s: error codec type\n", __func__);
	}

	if (atomic_inc_return(&pdata->clk_ref.quat_mi2s_clk_ref) == 1) {		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);		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__,		pr_debug("%s(): substream = %s stream = %d\n", __func__,
	substream->name, substream->stream);		substream->name, substream->stream);
	if ((pdata->ext_pa & QUIN_MI2S_ID) == QUIN_MI2S_ID) {
	ret = quin_mi2s_sclk_ctl(substream, false);		ret = quin_mi2s_sclk_ctl(substream, false);
	if (ret < 0)		if (ret < 0)
	pr_err("%s:clock disable failed\n", __func__);		pr_err("%s:clock disable failed\n", __func__);
	@@ -1774,7 +1767,6 @@ void msm_quin_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
	return;		return;
	}		}
	}		}
	}

	static int msm8952_wcd93xx_codec_up(struct snd_soc_codec *codec)		static int msm8952_wcd93xx_codec_up(struct snd_soc_codec *codec)
	{		{

sound/soc/msm/msm8952.c

+34 −48

Original line number	Original line	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__,		pr_debug("%s(): substream = %s stream = %d\n", __func__,
	substream->name, substream->stream);		substream->name, substream->stream);
	if ((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID) {
	if (pdata->vaddr_gpio_mux_mic_ctl) {		if (pdata->vaddr_gpio_mux_mic_ctl) {
	val = ioread32(pdata->vaddr_gpio_mux_mic_ctl);		val = ioread32(pdata->vaddr_gpio_mux_mic_ctl);
	val = val \| 0x02020002;		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");		pr_err("failed to enable codec gpios\n");
	goto err;		goto err;
	}		}
	} else {
	pr_err("%s: error codec type\n", __func__);
	}
	if (atomic_inc_return(&quat_mi2s_clk_ref) == 1) {		if (atomic_inc_return(&quat_mi2s_clk_ref) == 1) {
	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBS_CFS);		ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBS_CFS);
	if (ret < 0)		if (ret < 0)
	@@ -1384,13 +1380,9 @@ err:
	static void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream)		static void msm_quat_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
	{		{
	int ret;		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__,		pr_debug("%s(): substream = %s stream = %d\n", __func__,
	substream->name, substream->stream);		substream->name, substream->stream);
	if ((pdata->ext_pa & QUAT_MI2S_ID) == QUAT_MI2S_ID) {
	ret = msm_mi2s_sclk_ctl(substream, false);		ret = msm_mi2s_sclk_ctl(substream, false);
	if (ret < 0)		if (ret < 0)
	pr_err("%s:clock disable failed\n", __func__);		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;		return;
	}		}
	}		}
	}

	static int msm_quin_mi2s_snd_startup(struct snd_pcm_substream *substream)		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)		static void msm_quin_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
	{		{
	int ret;		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__,		pr_debug("%s(): substream = %s stream = %d\n", __func__,
	substream->name, substream->stream);		substream->name, substream->stream);
	if ((pdata->ext_pa & QUIN_MI2S_ID) == QUIN_MI2S_ID) {
	ret = msm_mi2s_sclk_ctl(substream, false);		ret = msm_mi2s_sclk_ctl(substream, false);
	if (ret < 0)		if (ret < 0)
	pr_err("%s:clock disable failed\n", __func__);		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;		return;
	}		}
	}		}
	}

	static void *def_msm8952_wcd_mbhc_cal(void)		static void *def_msm8952_wcd_mbhc_cal(void)
	{		{