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

Commit 8dc16af4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c133c879 on remote branch 

Change-Id: I722fa5b63b5c4418119253545143212c40f04d77
parents 939c18a8 c133c879

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},

asoc/kona.c

+9 −2
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ 


#define ADSP_STATE_READY_TIMEOUT_MS 3000



#define WSA8810_NAME_1 "wsa881x.20170211"

#define WSA8810_NAME_2 "wsa881x.20170212"

#define WSA8810_NAME_1 "wsa881x.1020170211"

#define WSA8810_NAME_2 "wsa881x.1020170212"

#define WSA8815_NAME_1 "wsa881x.1021170213"

#define WSA8815_NAME_2 "wsa881x.1021170214"

#define WCN_CDC_SLIM_RX_CH_MAX 2

#define WCN_CDC_SLIM_TX_CH_MAX 2

#define WCN_CDC_SLIM_TX_CH_MAX_LITO 3
@@ -5531,6 +5533,11 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd) 
						WSA_MACRO_SPKR_MODE_1);

				wsa_macro_set_spkr_gain_offset(component,

						WSA_MACRO_GAIN_OFFSET_M1P5_DB);

			} else if (aux_comp->name != NULL && (

				!strcmp(aux_comp->name, WSA8815_NAME_1) ||

		    		!strcmp(aux_comp->name, WSA8815_NAME_2))) {

				wsa_macro_set_spkr_mode(component,

						WSA_MACRO_SPKR_MODE_DEFAULT);

			}

		}

	}