Skip to content

Commit db6dd1b

Browse files
Srinivas-Kandagatlabroonie
authored andcommitted
ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use
SIDO(Single-Inductor Dual-Ouput) Buck powers up both analog and digital circuits along with internal memory, powering off this is the last thing that codec should do when going to very low power. Current code was powering off this Buck if there are no users of sysclk, which is not correct. Powering off this buck will result in no register access. This code path was never tested until recently after adding pm support in SoundWire controller. Fix this by removing the buck poweroff when the codec is active and also the code that is not used. Without this patch all the read/write transactions will never complete and results in SLIMBus Errors like: qcom,slim-ngd qcom,slim-ngd.1: Tx:MT:0x0, MC:0x60, LA:0xcf failed:-110 wcd934x-codec wcd934x-codec.1.auto: ASoC: error at soc_component_read_no_lock on wcd934x-codec.1.auto for register: [0x00000d05] -110 qcom,slim-ngd-ctrl 171c0000.slim: Error Interrupt received 0x82000000 Reported-by: Amit Pundir <amit.pundir@linaro.org> Fixes: a61f3b4 ("ASoC: wcd934x: add support to wcd9340/wcd9341 codec") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Tested-by: Amit Pundir <amit.pundir@linaro.org> Link: https://lore.kernel.org/r/20220407094313.2880-1-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 9b91d0e commit db6dd1b

1 file changed

Lines changed: 1 addition & 25 deletions

File tree

sound/soc/codecs/wcd934x.c

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,29 +1274,7 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
12741274
if (sido_src == wcd->sido_input_src)
12751275
return 0;
12761276

1277-
if (sido_src == SIDO_SOURCE_INTERNAL) {
1278-
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
1279-
WCD934X_ANA_BUCK_HI_ACCU_EN_MASK, 0);
1280-
usleep_range(100, 110);
1281-
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
1282-
WCD934X_ANA_BUCK_HI_ACCU_PRE_ENX_MASK, 0x0);
1283-
usleep_range(100, 110);
1284-
regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
1285-
WCD934X_ANA_RCO_BG_EN_MASK, 0);
1286-
usleep_range(100, 110);
1287-
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
1288-
WCD934X_ANA_BUCK_PRE_EN1_MASK,
1289-
WCD934X_ANA_BUCK_PRE_EN1_ENABLE);
1290-
usleep_range(100, 110);
1291-
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
1292-
WCD934X_ANA_BUCK_PRE_EN2_MASK,
1293-
WCD934X_ANA_BUCK_PRE_EN2_ENABLE);
1294-
usleep_range(100, 110);
1295-
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
1296-
WCD934X_ANA_BUCK_HI_ACCU_EN_MASK,
1297-
WCD934X_ANA_BUCK_HI_ACCU_ENABLE);
1298-
usleep_range(100, 110);
1299-
} else if (sido_src == SIDO_SOURCE_RCO_BG) {
1277+
if (sido_src == SIDO_SOURCE_RCO_BG) {
13001278
regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
13011279
WCD934X_ANA_RCO_BG_EN_MASK,
13021280
WCD934X_ANA_RCO_BG_ENABLE);
@@ -1382,8 +1360,6 @@ static int wcd934x_disable_ana_bias_and_syclk(struct wcd934x_codec *wcd)
13821360
regmap_update_bits(wcd->regmap, WCD934X_CLK_SYS_MCLK_PRG,
13831361
WCD934X_EXT_CLK_BUF_EN_MASK |
13841362
WCD934X_MCLK_EN_MASK, 0x0);
1385-
wcd934x_set_sido_input_src(wcd, SIDO_SOURCE_INTERNAL);
1386-
13871363
regmap_update_bits(wcd->regmap, WCD934X_ANA_BIAS,
13881364
WCD934X_ANA_BIAS_EN_MASK, 0);
13891365
regmap_update_bits(wcd->regmap, WCD934X_ANA_BIAS,

0 commit comments

Comments
 (0)