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

Commit 44f2b869 authored by Sudheer Papothi's avatar Sudheer Papothi Committed by Gerrit - the friendly Code Review server
Browse files

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



Update smart boost sequence for wsa883x speaker amplifier
to reach max voltage at full scale signal. Update
default tables to maintain backward compatible with
wsa8810/wsa8815.

Change-Id: Ic1a9ce13753d6e573c7916ae99643c85d6892aa0
Signed-off-by: default avatarSudheer Papothi <spapothi@codeaurora.org>
parent d3621034

asoc/codecs/bolero/wsa-macro.c

+6 −8
Original line number Diff line number Diff line
@@ -445,8 +445,8 @@ static struct snd_soc_dai_driver wsa_macro_dai[] = { 
static const struct wsa_macro_reg_mask_val wsa_macro_spkr_default[] = {

	{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_COMPANDER0_CTL7, 0x1F, 0x19},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x1F, 0x19},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CTL, 0x7C, 0x58},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CTL, 0x7C, 0x58},

};
@@ -454,8 +454,8 @@ static const struct wsa_macro_reg_mask_val wsa_macro_spkr_default[] = { 
static const struct wsa_macro_reg_mask_val wsa_macro_spkr_mode1[] = {

	{BOLERO_CDC_WSA_COMPANDER0_CTL3, 0x80, 0x00},

	{BOLERO_CDC_WSA_COMPANDER1_CTL3, 0x80, 0x00},

	{BOLERO_CDC_WSA_COMPANDER0_CTL7, 0x01, 0x00},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x01, 0x00},

	{BOLERO_CDC_WSA_COMPANDER0_CTL7, 0x1F, 0x18},

	{BOLERO_CDC_WSA_COMPANDER1_CTL7, 0x1F, 0x18},

	{BOLERO_CDC_WSA_BOOST0_BOOST_CTL, 0x7C, 0x44},

	{BOLERO_CDC_WSA_BOOST1_BOOST_CTL, 0x7C, 0x44},

};
@@ -2744,10 +2744,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},
@@ -2758,8 +2758,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},