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

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

Merge "ASoC: msm8x16-wcd: make default spkr_ocp hold enable"

parents 281f24e4 62b48b39

sound/soc/codecs/msm8x16-wcd.c

+2 −0
Original line number Diff line number Diff line
@@ -2981,6 +2981,7 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = { 
static const struct msm8x16_wcd_reg_mask_val msm8x16_wcd_reg_defaults[] = {

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SPKR_DAC_CTL, 0x03),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_CURRENT_LIMIT, 0x82),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SPKR_OCP_CTL, 0xE1),

};



static const struct msm8x16_wcd_reg_mask_val msm8x16_wcd_reg_defaults_2_0[] = {
@@ -2994,6 +2995,7 @@ static const struct msm8x16_wcd_reg_mask_val msm8x16_wcd_reg_defaults_2_0[] = { 
	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_PERPH_RESET_CTL3, 0x0F),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_CURRENT_LIMIT, 0x82),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SPKR_DAC_CTL, 0x03),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SPKR_OCP_CTL, 0xE1),

};



static void msm8x16_wcd_update_reg_defaults(struct snd_soc_codec *codec)

sound/soc/codecs/msm8x16_wcd_registers.h

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ 
#define MSM8X16_WCD_A_ANALOG_SPKR_ANA_BIAS_SET		(0x1B3)

#define MSM8X16_WCD_A_ANALOG_SPKR_ANA_BIAS_SET__POR		(0x4D)

#define MSM8X16_WCD_A_ANALOG_SPKR_OCP_CTL		(0x1B4)

#define MSM8X16_WCD_A_ANALOG_SPKR_OCP_CTL__POR			(0xA1)

#define MSM8X16_WCD_A_ANALOG_SPKR_OCP_CTL__POR			(0xE1)

#define MSM8X16_WCD_A_ANALOG_SPKR_PWRSTG_CTL		(0x1B5)

#define MSM8X16_WCD_A_ANALOG_SPKR_PWRSTG_CTL__POR		(0x1E)

#define MSM8X16_WCD_A_ANALOG_SPKR_DRV_MISC		(0x1B6)