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

Commit 912459be authored by Phani Kumar Uppalapati's avatar Phani Kumar Uppalapati Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: wcd9335: Update low hifi and low power modes for headphones 



Update register sequence for low hifi and low power modes
for headphones on wcd9335 codec to achieve better performance.

Change-Id: Icf543df7c4e8ab4cc9222a39bf1df4e6af4ab8ec
Signed-off-by: default avatarPhani Kumar Uppalapati <phaniu@codeaurora.org>
parent 70586523

include/linux/mfd/wcd9xxx/wcd9xxx_registers.h

+1 −0
Original line number Diff line number Diff line
@@ -340,4 +340,5 @@ 
#define WCD9XXX_CDC_RX1_RX_PATH_CTL			(0xB55)

#define WCD9XXX_CDC_RX2_RX_PATH_CTL			(0xB69)

#define WCD9XXX_CDC_CLK_RST_CTRL_MCLK_CONTROL		(0xD41)

#define WCD9XXX_CLASSH_CTRL_CCL_1                       (0x69C)

#endif

sound/soc/codecs/wcd9335.c

+11 −7
Original line number Diff line number Diff line
@@ -3839,18 +3839,20 @@ static void tasha_codec_hph_lohifi_config(struct snd_soc_codec *codec, 
					  int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event)) {

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL1, 0x0E, 0x02);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x08, 0x08);

		snd_soc_update_bits(codec, WCD9335_RX_BIAS_HPH_PA, 0x0F, 0x06);

		snd_soc_update_bits(codec, WCD9335_RX_BIAS_HPH_RDACBUFF_CNP2,

				    0xF0, 0x40);

		snd_soc_update_bits(codec, WCD9335_HPH_CNP_WG_CTL, 0x07, 0x03);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x08, 0x08);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL1, 0x0E, 0x0C);

		tasha_codec_hph_mode_gain_opt(codec, 0x11);

	}



	if (SND_SOC_DAPM_EVENT_OFF(event)) {

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x08, 0x00);

		snd_soc_update_bits(codec, WCD9335_HPH_CNP_WG_CTL, 0x07, 0x02);

		snd_soc_write(codec, WCD9335_RX_BIAS_HPH_RDACBUFF_CNP2, 0x8A);

		snd_soc_update_bits(codec, WCD9335_RX_BIAS_HPH_PA, 0x0F, 0x0A);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL1, 0x0E, 0x06);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x08, 0x00);

	}

}
@@ -3859,6 +3861,8 @@ static void tasha_codec_hph_lp_config(struct snd_soc_codec *codec, 
{

	if (SND_SOC_DAPM_EVENT_ON(event)) {

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL1, 0x0E, 0x0C);

		tasha_codec_hph_mode_gain_opt(codec, 0x10);

		snd_soc_update_bits(codec, WCD9335_HPH_CNP_WG_CTL, 0x07, 0x03);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x08, 0x08);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x04, 0x04);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x20, 0x20);
@@ -3873,14 +3877,14 @@ static void tasha_codec_hph_lp_config(struct snd_soc_codec *codec, 
	}



	if (SND_SOC_DAPM_EVENT_OFF(event)) {

		snd_soc_update_bits(codec, WCD9335_HPH_R_EN, 0xC0, 0x80);

		snd_soc_update_bits(codec, WCD9335_HPH_L_EN, 0xC0, 0x80);

		snd_soc_write(codec, WCD9335_RX_BIAS_HPH_RDAC_LDO, 0x88);

		snd_soc_write(codec, WCD9335_HPH_RDAC_LDO_CTL, 0x33);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x20, 0x00);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x04, 0x00);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL2, 0x08, 0x00);

		snd_soc_update_bits(codec, WCD9335_HPH_PA_CTL1, 0x0E, 0x06);

		snd_soc_update_bits(codec, WCD9335_HPH_CNP_WG_CTL, 0x07, 0x02);

		snd_soc_update_bits(codec, WCD9335_HPH_R_EN, 0xC0, 0x80);

		snd_soc_update_bits(codec, WCD9335_HPH_L_EN, 0xC0, 0x80);

	}

}

sound/soc/codecs/wcd9xxx-common-v2.c

+19 −3
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ enum { 
	VREF_FILT_R_100KOHM,

};



enum {

	DELTA_I_0MA,

	DELTA_I_10MA,

	DELTA_I_20MA,

	DELTA_I_30MA,

	DELTA_I_40MA,

	DELTA_I_50MA,

};



static void (*clsh_state_fp[NUM_CLSH_STATES_V2])(struct snd_soc_codec *,

					      struct wcd_clsh_cdc_data *,

					      u8 req_state, bool en, int mode);
@@ -284,6 +293,7 @@ static void wcd_clsh_set_hph_mode(struct snd_soc_codec *codec, 
	u8 val;

	u8 gain;

	u8 res_val = VREF_FILT_R_0OHM;

	u8 ipeak = DELTA_I_50MA;



	struct wcd9xxx *wcd9xxx = dev_get_drvdata(codec->dev->parent);
@@ -292,18 +302,21 @@ static void wcd_clsh_set_hph_mode(struct snd_soc_codec *codec, 
		res_val = VREF_FILT_R_50KOHM;

		val = 0x00;

		gain = DAC_GAIN_0DB;

		ipeak = DELTA_I_50MA;

		break;

	case CLS_AB:

		val = 0x00;

		gain = DAC_GAIN_0DB;

		ipeak = DELTA_I_50MA;

		break;

	case CLS_H_HIFI:

		val = 0x08;

		gain = DAC_GAIN_M0P2DB;

		ipeak = DELTA_I_50MA;

		break;

	case CLS_H_LP:

		val = 0x04;

		gain = DAC_GAIN_0P2DB;

		ipeak = DELTA_I_30MA;

		break;

	};
@@ -311,8 +324,11 @@ static void wcd_clsh_set_hph_mode(struct snd_soc_codec *codec, 
	if (TASHA_IS_2_0(wcd9xxx->version)) {

		snd_soc_update_bits(codec, WCD9XXX_CLASSH_CTRL_VCL_2,

				    0x30, (res_val << 4));

		if (mode != CLS_H_LP)

			snd_soc_update_bits(codec, WCD9XXX_HPH_REFBUFF_UHQA_CTL,

					    0x07, gain);

		snd_soc_update_bits(codec, WCD9XXX_CLASSH_CTRL_CCL_1,

				    0xF0, (ipeak << 4));

	}

}