Merge "ASoC: wcd9xxx: Fix codec regulator override"

diff --cc sound/soc/codecs/wcd934x/wcd934x.c
index f2850d5,12757dd..f888023
--- 1/sound/soc/codecs/wcd934x/wcd934x.c
--- 2/sound/soc/codecs/wcd934x/wcd934x.c
+++ b/sound/soc/codecs/wcd934x/wcd934x.c
@@@ -1880,14 -1879,9 +1880,10 @@@ static void tavil_codec_override(struc
  {
        if (mode == CLS_AB || mode == CLS_AB_HIFI) {
                switch (event) {
 +              case SND_SOC_DAPM_PRE_PMU:
                case SND_SOC_DAPM_POST_PMU:
-                       if (!(snd_soc_read(codec,
-                                       WCD934X_CDC_RX2_RX_PATH_CTL) & 0x10) &&
-                               (!(snd_soc_read(codec,
-                                       WCD934X_CDC_RX1_RX_PATH_CTL) & 0x10)))
-                               snd_soc_update_bits(codec,
-                                       WCD9XXX_A_ANA_RX_SUPPLIES, 0x02, 0x02);
+                       snd_soc_update_bits(codec,
+                               WCD9XXX_A_ANA_RX_SUPPLIES, 0x02, 0x02);
                break;
                case SND_SOC_DAPM_POST_PMD:
                        snd_soc_update_bits(codec,