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

Commit f34687bd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wsa-macro: Update smart boost sequence for wsa883x"

parents 8d117c37 fd6155a2

asoc/codecs/bolero/wsa-macro.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -2715,10 +2715,10 @@ static const struct snd_soc_dapm_route wsa_audio_map[] = { 
static const struct wsa_macro_reg_mask_val wsa_macro_reg_init[] = {

static const struct wsa_macro_reg_mask_val wsa_macro_reg_init[] = {

	{BOLERO_CDC_WSA_BOOST0_BOOST_CFG1, 0x3F, 0x12},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CFG1, 0x3F, 0x12},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CFG2, 0x1C, 0x08},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CFG2, 0x1C, 0x08},

	{BOLERO_CDC_WSA_COMPANDER0_CTL7, 0x1E, 0x18},

	{BOLERO_CDC_WSA_COMPANDER0_CTL7, 0x1E, 0x0C},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CFG1, 0x3F, 0x12},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CFG1, 0x3F, 0x12},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CFG2, 0x1C, 0x08},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CFG2, 0x1C, 0x08},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x1E, 0x18},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x1E, 0x0C},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CTL, 0x70, 0x58},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CTL, 0x70, 0x58},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CTL, 0x70, 0x58},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CTL, 0x70, 0x58},

	{BOLERO_CDC_WSA_RX0_RX_PATH_CFG1, 0x08, 0x08},

	{BOLERO_CDC_WSA_RX0_RX_PATH_CFG1, 0x08, 0x08},
@@ -2729,8 +2729,6 @@ static const struct wsa_macro_reg_mask_val wsa_macro_reg_init[] = { 
	{BOLERO_CDC_WSA_TX1_SPKR_PROT_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_TX1_SPKR_PROT_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_TX2_SPKR_PROT_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_TX2_SPKR_PROT_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_TX3_SPKR_PROT_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_TX3_SPKR_PROT_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_COMPANDER0_CTL3, 0x80, 0x80},

	{BOLERO_CDC_WSA_COMPANDER1_CTL3, 0x80, 0x80},

	{BOLERO_CDC_WSA_COMPANDER0_CTL7, 0x01, 0x01},

	{BOLERO_CDC_WSA_COMPANDER0_CTL7, 0x01, 0x01},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x01, 0x01},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x01, 0x01},

	{BOLERO_CDC_WSA_RX0_RX_PATH_CFG0, 0x01, 0x01},

	{BOLERO_CDC_WSA_RX0_RX_PATH_CFG0, 0x01, 0x01},

asoc/codecs/wsa883x/wsa883x.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,8 @@ struct wsa_reg_mask_val { 




static const struct wsa_reg_mask_val reg_init[] = {

static const struct wsa_reg_mask_val reg_init[] = {

	{WSA883X_PA_FSM_BYP, 0x01, 0x00},

	{WSA883X_PA_FSM_BYP, 0x01, 0x00},

	{WSA883X_ISENSE2, 0xE0, 0x40},

	{WSA883X_ADC_6, 0x02, 0x02},

	{WSA883X_CDC_SPK_DSM_A2_0, 0xFF, 0x0A},

	{WSA883X_CDC_SPK_DSM_A2_0, 0xFF, 0x0A},

	{WSA883X_CDC_SPK_DSM_A2_1, 0x0F, 0x08},

	{WSA883X_CDC_SPK_DSM_A2_1, 0x0F, 0x08},

	{WSA883X_CDC_SPK_DSM_A3_0, 0xFF, 0xF3},

	{WSA883X_CDC_SPK_DSM_A3_0, 0xFF, 0xF3},
@@ -117,8 +119,12 @@ static const struct wsa_reg_mask_val reg_init[] = { 
	{WSA883X_OTP_REG_3, 0xFF, 0xC9},

	{WSA883X_OTP_REG_3, 0xFF, 0xC9},

	{WSA883X_OTP_REG_4, 0xC0, 0x40},

	{WSA883X_OTP_REG_4, 0xC0, 0x40},

	{WSA883X_TAGC_CTL, 0x01, 0x01},

	{WSA883X_TAGC_CTL, 0x01, 0x01},

	{WSA883X_ADC_2, 0x40, 0x00},

	{WSA883X_ADC_7, 0x04, 0x04},

	{WSA883X_ADC_7, 0x02, 0x02},

	{WSA883X_CKWD_CTL_0, 0x60, 0x00},

	{WSA883X_CKWD_CTL_0, 0x60, 0x00},

	{WSA883X_CKWD_CTL_1, 0x1F, 0x1B},

	{WSA883X_CKWD_CTL_1, 0x1F, 0x1B},

	{WSA883X_GMAMP_SUP1, 0x60, 0x60},

};

};





static int wsa883x_get_temperature(struct snd_soc_component *component,

static int wsa883x_get_temperature(struct snd_soc_component *component,