diff options
| author | Xiaojun Sang <xsang@codeaurora.org> | 2018-02-12 19:03:02 +0800 |
|---|---|---|
| committer | Xiaojun Sang <xsang@codeaurora.org> | 2018-03-21 10:36:31 +0800 |
| commit | 09cd2ac5e9167ff81edf05e381a9a58748dfda2a (patch) | |
| tree | 1d28f74e0ca7ef9da2a6c9c221101dadc7e9b405 /asoc/codecs/wcd934x | |
| parent | 9cb7bc20c7eb56c330dec9013b99ec957d347934 (diff) | |
| download | msm-extra-09cd2ac5e9167ff81edf05e381a9a58748dfda2a.tar.gz | |
asoc: codecs: set boost state to MAX_STATE_2 for WSA8815
WSA8815 requires default boost state of MAX_STATE_2, when
speaker protection feature is disabled. Set boost state to
MAX_STATE_2 in all cases for WSA8815.
Change-Id: Ic700d9a206e94a4cdd1d99f8547bed9df1e759e8
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
Diffstat (limited to 'asoc/codecs/wcd934x')
| -rw-r--r-- | asoc/codecs/wcd934x/wcd934x-regmap.c | 6 | ||||
| -rw-r--r-- | asoc/codecs/wcd934x/wcd934x.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/asoc/codecs/wcd934x/wcd934x-regmap.c b/asoc/codecs/wcd934x/wcd934x-regmap.c index ff18bd80..c726c623 100644 --- a/asoc/codecs/wcd934x/wcd934x-regmap.c +++ b/asoc/codecs/wcd934x/wcd934x-regmap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -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, 0xb2 }, + { WCD934X_CDC_BOOST0_BOOST_CTL, 0xba }, { WCD934X_CDC_BOOST0_BOOST_CFG1, 0x00 }, { WCD934X_CDC_BOOST0_BOOST_CFG2, 0x00 }, { WCD934X_CDC_BOOST1_BOOST_PATH_CTL, 0x00 }, - { WCD934X_CDC_BOOST1_BOOST_CTL, 0xb2 }, + { WCD934X_CDC_BOOST1_BOOST_CTL, 0xba }, { WCD934X_CDC_BOOST1_BOOST_CFG1, 0x00 }, { WCD934X_CDC_BOOST1_BOOST_CFG2, 0x00 }, { WCD934X_CDC_VBAT_VBAT_PATH_CTL, 0x00 }, diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c index e7cec2b4..b68cc9af 100644 --- a/asoc/codecs/wcd934x/wcd934x.c +++ b/asoc/codecs/wcd934x/wcd934x.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -642,8 +642,8 @@ static const struct tavil_reg_mask_val tavil_spkr_default[] = { {WCD934X_CDC_COMPANDER8_CTL3, 0x80, 0x80}, {WCD934X_CDC_COMPANDER7_CTL7, 0x01, 0x01}, {WCD934X_CDC_COMPANDER8_CTL7, 0x01, 0x01}, - {WCD934X_CDC_BOOST0_BOOST_CTL, 0x7C, 0x50}, - {WCD934X_CDC_BOOST1_BOOST_CTL, 0x7C, 0x50}, + {WCD934X_CDC_BOOST0_BOOST_CTL, 0x7C, 0x58}, + {WCD934X_CDC_BOOST1_BOOST_CTL, 0x7C, 0x58}, }; static const struct tavil_reg_mask_val tavil_spkr_mode1[] = { @@ -8700,8 +8700,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, 0x50}, - {WCD934X_CDC_BOOST1_BOOST_CTL, 0x70, 0x50}, + {WCD934X_CDC_BOOST0_BOOST_CTL, 0x70, 0x58}, + {WCD934X_CDC_BOOST1_BOOST_CTL, 0x70, 0x58}, {WCD934X_CDC_RX7_RX_PATH_CFG1, 0x08, 0x08}, {WCD934X_CDC_RX8_RX_PATH_CFG1, 0x08, 0x08}, {WCD934X_CDC_TOP_TOP_CFG1, 0x02, 0x02}, |