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

Commit 40e873cc authored by Laxminath Kasam's avatar Laxminath Kasam
Browse files

ASoC: msm8x16-wcd: restore the speaker boost control 



To maintain same design across chipsets,
to disable or enable speaker/EAR boost controls,
restore the speaker boost control which can be
set to ENABLE/DISABLE using mixer XML file.
Clients can choose the configuration based on
design needs.

CRs-Fixed: 1002094
Change-Id: I4687b819009a3b57c3b0070b4de60e7b5451e664
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent edf4d230

sound/soc/codecs/msm8x16-wcd.c

+48 −0
Original line number Diff line number Diff line
@@ -2183,6 +2183,51 @@ static int msm8x16_wcd_boost_option_set(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int msm8x16_wcd_spk_boost_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct msm8x16_wcd_priv *msm8x16_wcd = snd_soc_codec_get_drvdata(codec);



	if (msm8x16_wcd->spk_boost_set == false) {

		ucontrol->value.integer.value[0] = 0;

	} else if (msm8x16_wcd->spk_boost_set == true) {

		ucontrol->value.integer.value[0] = 1;

	} else  {

		dev_err(codec->dev, "%s: ERROR: Unsupported Speaker Boost = %d\n",

				__func__, msm8x16_wcd->spk_boost_set);

		return -EINVAL;

	}



	dev_dbg(codec->dev, "%s: msm8x16_wcd->spk_boost_set = %d\n", __func__,

			msm8x16_wcd->spk_boost_set);

	return 0;

}



static int msm8x16_wcd_spk_boost_set(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct msm8x16_wcd_priv *msm8x16_wcd = snd_soc_codec_get_drvdata(codec);



	dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",

			__func__, ucontrol->value.integer.value[0]);



	switch (ucontrol->value.integer.value[0]) {

	case 0:

		msm8x16_wcd->spk_boost_set = false;

		break;

	case 1:

		msm8x16_wcd->spk_boost_set = true;

		break;

	default:

		return -EINVAL;

	}

	dev_dbg(codec->dev, "%s: msm8x16_wcd->spk_boost_set = %d\n",

		__func__, msm8x16_wcd->spk_boost_set);

	return 0;

}



static int msm8x16_wcd_ext_spk_boost_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{
@@ -2546,6 +2591,9 @@ static const struct snd_kcontrol_new msm8x16_wcd_snd_controls[] = { 
	SOC_ENUM_EXT("EAR PA Gain", msm8x16_wcd_ear_pa_gain_enum[0],

		msm8x16_wcd_pa_gain_get, msm8x16_wcd_pa_gain_put),



	SOC_ENUM_EXT("Speaker Boost", msm8x16_wcd_spk_boost_ctl_enum[0],

		msm8x16_wcd_spk_boost_get, msm8x16_wcd_spk_boost_set),



	SOC_ENUM_EXT("Ext Spk Boost", msm8x16_wcd_ext_spk_boost_ctl_enum[0],

		msm8x16_wcd_ext_spk_boost_get, msm8x16_wcd_ext_spk_boost_set),