A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
qctecmdr 2020-04-01 00:19:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit f34687bd3a
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
asoc/codecs/bolero/wsa-macro.c
View file

@ -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[] = {
{BOLERO_CDC_WSA_BOOST0_BOOST_CFG1, 0x3F, 0x12},
{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_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_BOOST1_BOOST_CTL, 0x70, 0x58},
{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_TX2_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_COMPANDER1_CTL7, 0x01, 0x01},
{BOLERO_CDC_WSA_RX0_RX_PATH_CFG0, 0x01, 0x01},

6
asoc/codecs/wsa883x/wsa883x.c
View file

@ -79,6 +79,8 @@ struct wsa_reg_mask_val {
static const struct wsa_reg_mask_val reg_init[] = {
{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_1, 0x0F, 0x08},
{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_4, 0xC0, 0x40},
{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_1, 0x1F, 0x1B},
{WSA883X_GMAMP_SUP1, 0x60, 0x60},
};
static int wsa883x_get_temperature(struct snd_soc_component *component,