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

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

Merge "ASoC: wcd934x: Enable smart boost on WCD9340 codec"

parents 0cd21ace 976c5443

sound/soc/codecs/wcd934x/wcd934x.c

+10 −2
Original line number Diff line number Diff line
@@ -4924,14 +4924,18 @@ static const struct tavil_reg_mask_val tavil_codec_reg_defaults[] = { 
	{WCD934X_CDC_RX0_RX_PATH_SEC0, 0x08, 0x0},

	{WCD934X_CDC_CLSH_DECAY_CTRL, 0x03, 0x0},

	{WCD934X_MICB1_TEST_CTL_2, 0x07, 0x01},

	{WCD934X_CDC_BOOST0_BOOST_CFG1, 0x3F, 0x12},

	{WCD934X_CDC_BOOST0_BOOST_CFG2, 0x1C, 0x08},

	{WCD934X_CDC_BOOST1_BOOST_CFG1, 0x3F, 0x12},

	{WCD934X_CDC_BOOST1_BOOST_CFG2, 0x1C, 0x08},

};



static const struct tavil_reg_mask_val tavil_codec_reg_init_common_val[] = {

	{WCD934X_CDC_CLSH_K2_MSB, 0x0F, 0x00},

	{WCD934X_CDC_CLSH_K2_LSB, 0xFF, 0x60},

	{WCD934X_CPE_SS_DMIC_CFG, 0x80, 0x00},

	{WCD934X_CDC_BOOST0_BOOST_CTL, 0x70, 0x40},

	{WCD934X_CDC_BOOST1_BOOST_CTL, 0x70, 0x40},

	{WCD934X_CDC_BOOST0_BOOST_CTL, 0x70, 0x50},

	{WCD934X_CDC_BOOST1_BOOST_CTL, 0x70, 0x50},

	{WCD934X_CDC_RX7_RX_PATH_CFG1, 0x08, 0x08},

	{WCD934X_CDC_RX8_RX_PATH_CFG1, 0x08, 0x08},

	{WCD934X_CDC_TOP_TOP_CFG1, 0x02, 0x02},
@@ -4949,6 +4953,10 @@ static const struct tavil_reg_mask_val tavil_codec_reg_init_common_val[] = { 
	{WCD934X_CDC_RX8_RX_PATH_MIX_CFG, 0x01, 0x01},

	{WCD934X_DATA_HUB_SB_TX11_INP_CFG, 0x01, 0x01},

	{WCD934X_CDC_CLK_RST_CTRL_FS_CNT_CONTROL, 0x01, 0x01},

	{WCD934X_CDC_COMPANDER7_CTL3, 0x80, 0x80},

	{WCD934X_CDC_COMPANDER8_CTL3, 0x80, 0x80},

	{WCD934X_CDC_COMPANDER7_CTL7, 0x01, 0x01},

	{WCD934X_CDC_COMPANDER8_CTL7, 0x01, 0x01},

};



static void tavil_codec_init_reg(struct snd_soc_codec *codec)