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

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

Merge "ASoC: msm: Include codec mixer control for MPQ8092"

parents db2ea221 6df708f3

sound/soc/msm/mpq8092.c

+84 −78
Original line number Diff line number Diff line
@@ -771,84 +771,6 @@ static void *def_tabla_mbhc_cal(void) 
	return tabla_cal;

}



static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)

{

	int err  = 0;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;



	unsigned int rx_ch[TABLA_RX_MAX] = {138, 139, 140, 141, 142, 143, 144};

	unsigned int tx_ch[TABLA_TX_MAX]  = {128, 129, 130, 131, 132, 133, 134,

						 135, 136, 137};



	pr_info("%s(), dev_name%s\n", __func__, dev_name(cpu_dai->dev));



	rtd->pmdown_time = 0;



	snd_soc_dapm_new_controls(dapm, mpq8092_dapm_widgets,

				ARRAY_SIZE(mpq8092_dapm_widgets));

	snd_soc_dapm_enable_pin(dapm, "Lineout_1 amp");

	snd_soc_dapm_enable_pin(dapm, "Lineout_3 amp");

	snd_soc_dapm_enable_pin(dapm, "Lineout_2 amp");

	snd_soc_dapm_enable_pin(dapm, "Lineout_4 amp");



	snd_soc_dapm_ignore_suspend(dapm, "Lineout_1 amp");

	snd_soc_dapm_ignore_suspend(dapm, "Lineout_3 amp");

	snd_soc_dapm_ignore_suspend(dapm, "Lineout_2 amp");

	snd_soc_dapm_ignore_suspend(dapm, "Lineout_4 amp");

	snd_soc_dapm_ignore_suspend(dapm, "SPK_ultrasound amp");

	snd_soc_dapm_ignore_suspend(dapm, "Handset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "ANCRight Headset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "ANCLeft Headset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic1");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic2");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic3");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic4");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic5");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic6");



	snd_soc_dapm_ignore_suspend(dapm, "EAR");

	snd_soc_dapm_ignore_suspend(dapm, "HEADPHONE");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT1");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT2");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT3");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT4");

	snd_soc_dapm_ignore_suspend(dapm, "SPK_OUT");

	snd_soc_dapm_ignore_suspend(dapm, "ANC HEADPHONE");

	snd_soc_dapm_ignore_suspend(dapm, "ANC EAR");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC1");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC2");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC3");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC4");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC1");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC2");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC3");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC4");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC5");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC6");



	snd_soc_dapm_sync(dapm);



	if (err) {

		pr_err("%s: apq8084 mclk_gpio init failed (%d)\n",

			__func__, err);

	}



	snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch),

				    tx_ch, ARRAY_SIZE(rx_ch), rx_ch);



	mbhc_cfg.calibration = def_tabla_mbhc_cal();

	if (mbhc_cfg.calibration)

		err = 0;

	else

		err = -ENOMEM;



	return err;

}



static void mpq8092_snd_shudown(struct snd_pcm_substream *substream)

{

	pr_debug("%s(): substream = %s stream = %d\n", __func__,
@@ -1029,6 +951,90 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
			sec_rx_bit_format_get, sec_rx_bit_format_put),

};



static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)

{

	int err  = 0;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;



	unsigned int rx_ch[TABLA_RX_MAX] = {138, 139, 140, 141, 142, 143, 144};

	unsigned int tx_ch[TABLA_TX_MAX]  = {128, 129, 130, 131, 132, 133, 134,

						 135, 136, 137};



	pr_info("%s(), dev_name%s\n", __func__, dev_name(cpu_dai->dev));



	rtd->pmdown_time = 0;



	err = snd_soc_add_codec_controls(codec, msm_snd_controls,

					 ARRAY_SIZE(msm_snd_controls));

	if (err < 0)

		return err;



	snd_soc_dapm_new_controls(dapm, mpq8092_dapm_widgets,

				ARRAY_SIZE(mpq8092_dapm_widgets));

	snd_soc_dapm_enable_pin(dapm, "Lineout_1 amp");

	snd_soc_dapm_enable_pin(dapm, "Lineout_3 amp");

	snd_soc_dapm_enable_pin(dapm, "Lineout_2 amp");

	snd_soc_dapm_enable_pin(dapm, "Lineout_4 amp");



	snd_soc_dapm_ignore_suspend(dapm, "Lineout_1 amp");

	snd_soc_dapm_ignore_suspend(dapm, "Lineout_3 amp");

	snd_soc_dapm_ignore_suspend(dapm, "Lineout_2 amp");

	snd_soc_dapm_ignore_suspend(dapm, "Lineout_4 amp");

	snd_soc_dapm_ignore_suspend(dapm, "SPK_ultrasound amp");

	snd_soc_dapm_ignore_suspend(dapm, "Handset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "ANCRight Headset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "ANCLeft Headset Mic");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic1");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic2");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic3");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic4");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic5");

	snd_soc_dapm_ignore_suspend(dapm, "Digital Mic6");



	snd_soc_dapm_ignore_suspend(dapm, "EAR");

	snd_soc_dapm_ignore_suspend(dapm, "HEADPHONE");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT1");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT2");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT3");

	snd_soc_dapm_ignore_suspend(dapm, "LINEOUT4");

	snd_soc_dapm_ignore_suspend(dapm, "SPK_OUT");

	snd_soc_dapm_ignore_suspend(dapm, "ANC HEADPHONE");

	snd_soc_dapm_ignore_suspend(dapm, "ANC EAR");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC1");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC2");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC3");

	snd_soc_dapm_ignore_suspend(dapm, "AMIC4");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC1");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC2");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC3");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC4");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC5");

	snd_soc_dapm_ignore_suspend(dapm, "DMIC6");



	snd_soc_dapm_sync(dapm);



	if (err) {

		pr_err("%s: apq8084 mclk_gpio init failed (%d)\n",

			__func__, err);

	}



	snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch),

				    tx_ch, ARRAY_SIZE(rx_ch), rx_ch);



	mbhc_cfg.calibration = def_tabla_mbhc_cal();

	if (mbhc_cfg.calibration)

		err = 0;

	else

		err = -ENOMEM;



	return err;

}





static struct snd_soc_dai_link mpq8092_common_dai_links[] = {

	/* FrontEnd DAI Links */

	{