Merge "asoc: msm: assign mic gnd swap function"
diff --git a/asoc/codecs/wcd9360/wcd9360-routing.h b/asoc/codecs/wcd9360/wcd9360-routing.h
index 1d41c0a..c305d2e 100644
--- a/asoc/codecs/wcd9360/wcd9360-routing.h
+++ b/asoc/codecs/wcd9360/wcd9360-routing.h
@@ -862,8 +862,13 @@
{"RX INT8 SEC MIX", NULL, "ASRC3 MUX"},
/* SLIMBUS-I2S Bridge interface */
- {"I2S TX1_0 MUX", "AIF4_PB", "AIF4 PB"},
- {"I2S TX1_1 MUX", "AIF4_PB", "AIF4 PB"},
+ {"I2S TX1_0 MUX", "SB_RX2", "SLIM RX2"},
+
+ {"I2S TX1_1 MUX", "SB_RX0", "SLIM RX0"},
+ {"I2S TX1_1 MUX", "SB_RX1", "SLIM RX1"},
+ {"I2S TX1_1 MUX", "SB_RX2", "SLIM RX2"},
+ {"I2S TX1_1 MUX", "SB_RX3", "SLIM RX3"},
+
{"I2S TX1 MIXER", NULL, "I2S TX1_0 MUX"},
{"I2S TX1 MIXER", NULL, "I2S TX1_1 MUX"},
{"I2S1 CAP", NULL, "I2S TX1 MIXER"},
diff --git a/asoc/codecs/wcd9360/wcd9360.c b/asoc/codecs/wcd9360/wcd9360.c
index 5b8da20..c5fe3a0 100644
--- a/asoc/codecs/wcd9360/wcd9360.c
+++ b/asoc/codecs/wcd9360/wcd9360.c
@@ -137,7 +137,7 @@
#define DAPM_MICBIAS3_STANDALONE "MIC BIAS3 Standalone"
#define DAPM_MICBIAS4_STANDALONE "MIC BIAS4 Standalone"
-#define WCD9360_LDO_RXTX_SUPPLY_NAME "vdd_ldo_rxtx_supply"
+#define WCD9360_LDO_RXTX_SUPPLY_NAME "cdc-vdd-ldo-rxtx"
#define TX_HPF_CUT_OFF_FREQ_MASK 0x60
#define CF_MIN_3DB_4HZ 0x0
@@ -4323,7 +4323,7 @@
SOC_SINGLE_MULTI_EXT("IIR0 Band5", IIR0, BAND5, 255, 0, 5,
pahu_iir_band_audio_mixer_get, pahu_iir_band_audio_mixer_put),
- SOC_SINGLE_EXT("COMP0 Switch", SND_SOC_NOPM, COMPANDER_1, 1, 0,
+ SOC_SINGLE_EXT("COMP0 Switch", SND_SOC_NOPM, COMPANDER_0, 1, 0,
pahu_compander_get, pahu_compander_put),
SOC_SINGLE_EXT("COMP7 Switch", SND_SOC_NOPM, COMPANDER_7, 1, 0,
pahu_compander_get, pahu_compander_put),
@@ -6749,8 +6749,6 @@
{WCD9360_CDC_COMPANDER7_CTL7, 0x01, 0x01},
{WCD9360_CDC_COMPANDER8_CTL7, 0x01, 0x01},
{WCD9360_CODEC_RPM_CLK_GATE, 0x08, 0x00},
- {WCD9360_TLMM_DMIC3_CLK_PINCFG, 0xFF, 0x0a},
- {WCD9360_TLMM_DMIC3_DATA_PINCFG, 0xFF, 0x0a},
{WCD9360_CPE_SS_SVA_CFG, 0x60, 0x00},
{WCD9360_CPE_SS_CPAR_CFG, 0x10, 0x10},
};
diff --git a/asoc/sdm855.c b/asoc/sdm855.c
index e450e13..5880846 100644
--- a/asoc/sdm855.c
+++ b/asoc/sdm855.c
@@ -3072,7 +3072,8 @@
msm_mclk_tx_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MIC("Handset Mic", NULL),
- SND_SOC_DAPM_MIC("Headset Mic", NULL),
+ SND_SOC_DAPM_MIC("Analog Mic3", NULL),
+ SND_SOC_DAPM_MIC("Analog Mic4", NULL),
SND_SOC_DAPM_MIC("Digital Mic0", NULL),
SND_SOC_DAPM_MIC("Digital Mic1", NULL),
@@ -3852,7 +3853,6 @@
}
snd_soc_dapm_ignore_suspend(dapm, "Handset Mic");
- snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");
snd_soc_dapm_ignore_suspend(dapm, "Digital Mic0");
snd_soc_dapm_ignore_suspend(dapm, "Digital Mic1");
snd_soc_dapm_ignore_suspend(dapm, "Digital Mic2");
@@ -3871,10 +3871,10 @@
snd_soc_dapm_ignore_suspend(dapm, "VIINPUT");
if (!strcmp(dev_name(codec_dai->dev), "tavil_codec")) {
+ snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");
snd_soc_dapm_ignore_suspend(dapm, "ANCRight Headset Mic");
snd_soc_dapm_ignore_suspend(dapm, "ANCLeft Headset Mic");
snd_soc_dapm_ignore_suspend(dapm, "Analog Mic5");
- snd_soc_dapm_ignore_suspend(dapm, "Analog Mic6");
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT1");
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT2");
snd_soc_dapm_ignore_suspend(dapm, "HPHL");
@@ -3884,6 +3884,8 @@
} else {
snd_soc_dapm_ignore_suspend(dapm, "Digital Mic6");
snd_soc_dapm_ignore_suspend(dapm, "Digital Mic7");
+ snd_soc_dapm_ignore_suspend(dapm, "Analog Mic3");
+ snd_soc_dapm_ignore_suspend(dapm, "Analog Mic4");
}
snd_soc_dapm_sync(dapm);