cs35l41: Remove VBSTMON DAPM Switch
This reverts commit "ASoC: cs35l41: VBSTMON DAPM Switch"
This commit caused the amp power on event come too early.
AMP on/off sequence before revert the change:
amp turn on -> alsa bind command
alsa unbind command -> amp turn off
AMP on/off sequence after revert the change:
alsa bind command -> amp turn on
amp turn off -> unbind command
Bug: 284201179
Test: Local stress test and no issue found.
Change-Id: I03e9165495fe7bcd569a33096b162b03236fd06c
Signed-off-by: David Rhodes <david.rhodes@cirrus.com>
Signed-off-by: Robert Lee <lerobert@google.com>
diff --git a/cs35l41/cs35l41.c b/cs35l41/cs35l41.c
index d7f437a..8f30c6c 100644
--- a/cs35l41/cs35l41.c
+++ b/cs35l41/cs35l41.c
@@ -881,8 +881,6 @@
static const struct snd_kcontrol_new dre_ctrl =
SOC_DAPM_SINGLE("DRE Switch", CS35L41_PWR_CTRL3, 20, 1, 0);
-static const struct snd_kcontrol_new vbstmon_out_ctrl =
- SOC_DAPM_SINGLE("Switch", SND_SOC_NOPM, 0, 1, 0);
static const struct snd_kcontrol_new main_amp_enable_ctrl =
SOC_DAPM_SINGLE("Switch", SND_SOC_NOPM, 0, 1, 0);
static const char * const cs35l41_pcm_sftramp_text[] = {
@@ -2331,8 +2329,6 @@
SND_SOC_DAPM_MUX("DSP RX2 Source", SND_SOC_NOPM, 0, 0, &dsp_rx2_mux),
SND_SOC_DAPM_MUX("PCM Source", SND_SOC_NOPM, 0, 0, &pcm_source_mux),
SND_SOC_DAPM_SWITCH("DRE", SND_SOC_NOPM, 0, 0, &dre_ctrl),
- SND_SOC_DAPM_SWITCH("VBSTMON Output", SND_SOC_NOPM, 0, 0,
- &vbstmon_out_ctrl),
SND_SOC_DAPM_SWITCH("Main AMP Enable", SND_SOC_NOPM, 0, 0,
&main_amp_enable_ctrl),
};
@@ -2409,10 +2405,6 @@
{"TEMPMON ADC", NULL, "ASPRX1"},
{"VBSTMON ADC", NULL, "ASPRX1"},
- {"VBSTMON Output", "Switch", "VBST"},
- {"CLASS H", NULL, "VBSTMON Output"},
- {"VBSTMON ADC", NULL, "VBSTMON Output"},
-
{"DSP1", NULL, "IMON ADC"},
{"DSP1", NULL, "VMON ADC"},
{"DSP1", NULL, "VBSTMON ADC"},
