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

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

Merge "ASoC: route lineout to wsa for msmtitanium"

parents bd4743e8 8280f16b

sound/soc/codecs/msm8x16-wcd.c

+51 −8
Original line number Diff line number Diff line
@@ -3979,18 +3979,28 @@ static int msm8x16_wcd_lo_dac_event(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x10);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x20, 0x20);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x80, 0x80);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x08, 0x08);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x40, 0x40);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_COM_BIAS_DAC, 0xff, 0x98);

		break;

	case SND_SOC_DAPM_POST_PMU:

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x80, 0x80);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x08, 0x08);

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x08, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x40, 0x40);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_COM_BIAS_DAC, 0xff, 0x98);

		break;

	case SND_SOC_DAPM_POST_PMD:

		usleep_range(20000, 20100);
@@ -3998,8 +4008,14 @@ static int msm8x16_wcd_lo_dac_event(struct snd_soc_dapm_widget *w, 
			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x80, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x40, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x08, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x80, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x40, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x20, 0x00);

		break;

	}

	return 0;
@@ -4174,14 +4190,20 @@ static const struct snd_soc_dapm_route audio_map[] = { 


	{"SPK_OUT", NULL, "SPK PA"},

	{"SPK PA", NULL, "SPK_RX_BIAS"},

	{"SPK PA", NULL, "SPK"},

	{"SPK", "Switch", "SPK DAC"},

	{"SPK DAC", NULL, "RX3 CHAIN"},

	{"SPK PA", NULL, "SPK DAC"},

	{"SPK DAC", "Switch", "RX3 CHAIN"},

	{"SPK DAC", NULL, "VDD_SPKDRV"},



	/* lineout */

	{"LINEOUT", NULL, "LINEOUT PA"},

	{"LINEOUT PA", NULL, "SPK_RX_BIAS"},

	{"LINEOUT PA", NULL, "LINE_OUT"},

	{"LINE_OUT", "Switch", "LINEOUT DAC"},

	{"LINEOUT DAC", NULL, "RX3 CHAIN"},

	{"LINEOUT PA", NULL, "LINEOUT DAC"},

	{"LINEOUT", NULL, "LINEOUT PA"},

	{"SPK DAC", NULL, "VDD_SPKDRV"},



	/* lineout to WSA */

	{"WSA_SPK_OUT", NULL, "WSA Spk Switch"},

	{"WSA Spk Switch", "WSA", "LINEOUT PA"},



	{"RX1 CHAIN", NULL, "RX1 CLK"},

	{"RX2 CHAIN", NULL, "RX2 CLK"},
@@ -4596,6 +4618,26 @@ static int msm8x16_wcd_codec_enable_rx_chain(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int msm8x16_wcd_codec_enable_lo_pa(struct snd_soc_dapm_widget *w,

				     struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;



	dev_dbg(w->codec->dev, "%s: %d %s\n", __func__, event, w->name);

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_CDC_RX3_B6_CTL, 0x01, 0x00);

		break;

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_CDC_RX3_B6_CTL, 0x01, 0x00);

		break;

	}



	return 0;

}



static int msm8x16_wcd_codec_enable_spk_ext_pa(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

{
@@ -4756,7 +4798,8 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = { 
			SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_PGA_E("LINEOUT PA", MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL,

			4, 0 , NULL, 0, NULL, 0),

			5, 0 , NULL, 0, msm8x16_wcd_codec_enable_lo_pa,

			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_SUPPLY("VDD_SPKDRV", SND_SOC_NOPM, 0, 0,

			    msm89xx_wcd_codec_enable_vdd_spkr,