Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ASoC: codecs: fix inconsistency of boost state register value" into audio-drivers.lnx.3.0

Browse source
This commit is contained in:
Linux Build Service Account 2018-06-08 21:04:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4ea1aaec01
6 changed files with 12 additions and 12 deletions

4
asoc/codecs/msm_sdw/msm_sdw_cdc.c
View file

@ -1705,8 +1705,8 @@ static const struct msm_sdw_reg_mask_val msm_sdw_reg_init[] = {
{MSM_SDW_BOOST1_BOOST_CFG1, 0x3F, 0x12},
{MSM_SDW_BOOST1_BOOST_CFG2, 0x1C, 0x08},
{MSM_SDW_COMPANDER8_CTL7, 0x1E, 0x18},
{MSM_SDW_BOOST0_BOOST_CTL, 0x70, 0x58},
{MSM_SDW_BOOST1_BOOST_CTL, 0x70, 0x58},
{MSM_SDW_BOOST0_BOOST_CTL, 0x7C, 0x58},
{MSM_SDW_BOOST1_BOOST_CTL, 0x7C, 0x58},
{MSM_SDW_RX7_RX_PATH_CFG1, 0x08, 0x08},
{MSM_SDW_RX8_RX_PATH_CFG1, 0x08, 0x08},
{MSM_SDW_TOP_TOP_CFG1, 0x02, 0x02},

4
asoc/codecs/msm_sdw/msm_sdw_regmap.c
View file

@ -65,11 +65,11 @@ static const struct reg_default msm_sdw_defaults[] = {
{ MSM_SDW_RX8_RX_PATH_MIX_SEC1, 0x00 },
/* Page #12 registers */
{ MSM_SDW_BOOST0_BOOST_PATH_CTL, 0x00 },
{ MSM_SDW_BOOST0_BOOST_CTL, 0xba },
{ MSM_SDW_BOOST0_BOOST_CTL, 0xb2 },
{ MSM_SDW_BOOST0_BOOST_CFG1, 0x00 },
{ MSM_SDW_BOOST0_BOOST_CFG2, 0x00 },
{ MSM_SDW_BOOST1_BOOST_PATH_CTL, 0x00 },
{ MSM_SDW_BOOST1_BOOST_CTL, 0xba },
{ MSM_SDW_BOOST1_BOOST_CTL, 0xb2 },
{ MSM_SDW_BOOST1_BOOST_CFG1, 0x00 },
{ MSM_SDW_BOOST1_BOOST_CFG2, 0x00 },
{ MSM_SDW_AHB_BRIDGE_WR_DATA_0, 0x00 },

4
asoc/codecs/wcd9335-regmap.c
View file

@ -1213,11 +1213,11 @@ static const struct reg_default wcd9335_defaults[] = {
{ WCD9335_CDC_CLSH_TEST1, 0x00 },
{ WCD9335_CDC_CLSH_OVR_VREF, 0x00 },
{ WCD9335_CDC_BOOST0_BOOST_PATH_CTL, 0x00 },
{ WCD9335_CDC_BOOST0_BOOST_CTL, 0xba },
{ WCD9335_CDC_BOOST0_BOOST_CTL, 0xb2 },
{ WCD9335_CDC_BOOST0_BOOST_CFG1, 0x00 },
{ WCD9335_CDC_BOOST0_BOOST_CFG2, 0x00 },
{ WCD9335_CDC_BOOST1_BOOST_PATH_CTL, 0x00 },
{ WCD9335_CDC_BOOST1_BOOST_CTL, 0xba },
{ WCD9335_CDC_BOOST1_BOOST_CTL, 0xb2 },
{ WCD9335_CDC_BOOST1_BOOST_CFG1, 0x00 },
{ WCD9335_CDC_BOOST1_BOOST_CFG2, 0x00 },
{ WCD9335_SWR_AHB_BRIDGE_WR_DATA_0, 0x00 },

4
asoc/codecs/wcd9335.c
View file

@ -12405,8 +12405,8 @@ static const struct tasha_reg_mask_val tasha_codec_reg_init_common_val[] = {
{WCD9335_CDC_CLSH_K2_MSB, 0x0F, 0x00},
{WCD9335_CDC_CLSH_K2_LSB, 0xFF, 0x60},
{WCD9335_CPE_SS_DMIC_CFG, 0x80, 0x00},
{WCD9335_CDC_BOOST0_BOOST_CTL, 0x70, 0x58},
{WCD9335_CDC_BOOST1_BOOST_CTL, 0x70, 0x58},
{WCD9335_CDC_BOOST0_BOOST_CTL, 0x7C, 0x58},
{WCD9335_CDC_BOOST1_BOOST_CTL, 0x7C, 0x58},
{WCD9335_CDC_RX7_RX_PATH_CFG1, 0x08, 0x08},
{WCD9335_CDC_RX8_RX_PATH_CFG1, 0x08, 0x08},
{WCD9335_ANA_LO_1_2, 0x3C, 0X3C},

4
asoc/codecs/wcd934x/wcd934x-regmap.c
View file

@ -1248,11 +1248,11 @@ static const struct reg_default wcd934x_defaults[] = {
{ WCD934X_CDC_CLSH_TEST1, 0x00 },
{ WCD934X_CDC_CLSH_OVR_VREF, 0x00 },
{ WCD934X_CDC_BOOST0_BOOST_PATH_CTL, 0x00 },
{ WCD934X_CDC_BOOST0_BOOST_CTL, 0xba },
{ WCD934X_CDC_BOOST0_BOOST_CTL, 0xb2 },
{ WCD934X_CDC_BOOST0_BOOST_CFG1, 0x00 },
{ WCD934X_CDC_BOOST0_BOOST_CFG2, 0x00 },
{ WCD934X_CDC_BOOST1_BOOST_PATH_CTL, 0x00 },
{ WCD934X_CDC_BOOST1_BOOST_CTL, 0xba },
{ WCD934X_CDC_BOOST1_BOOST_CTL, 0xb2 },
{ WCD934X_CDC_BOOST1_BOOST_CFG1, 0x00 },
{ WCD934X_CDC_BOOST1_BOOST_CFG2, 0x00 },
{ WCD934X_CDC_VBAT_VBAT_PATH_CTL, 0x00 },

4
asoc/codecs/wcd934x/wcd934x.c
View file

@ -9431,8 +9431,8 @@ 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, 0x58},
{WCD934X_CDC_BOOST1_BOOST_CTL, 0x70, 0x58},
{WCD934X_CDC_BOOST0_BOOST_CTL, 0x7C, 0x58},
{WCD934X_CDC_BOOST1_BOOST_CTL, 0x7C, 0x58},
{WCD934X_CDC_RX7_RX_PATH_CFG1, 0x08, 0x08},
{WCD934X_CDC_RX8_RX_PATH_CFG1, 0x08, 0x08},
{WCD934X_CDC_TOP_TOP_CFG1, 0x02, 0x02},