diff options
| author | Maciej Strozek <mstrozek@opensource.cirrus.com> | 2023-11-17 15:13:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-11-17 21:21:32 +0100 |
| commit | 9158221bf2aa5f7bfb916452c079b2fe63ca76e8 (patch) | |
| tree | f62c91a1ea4745dbbfd380a5dd7de837cc68cfdc /sound/soc/codecs/cs43130.c | |
| parent | ASoC: cs43130: Add handling of ACPI (diff) | |
| download | linux-9158221bf2aa5f7bfb916452c079b2fe63ca76e8.tar.xz linux-9158221bf2aa5f7bfb916452c079b2fe63ca76e8.zip | |
ASoC: cs43130: Add switch to control normal and alt hp inputs
Make sure these inputs are mutually exclusive as recommended by the
datasheet
Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231117141344.64320-8-mstrozek@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/cs43130.c')
| -rw-r--r-- | sound/soc/codecs/cs43130.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index a51d77947964..845611afed85 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c @@ -1366,7 +1366,15 @@ static int cs43130_hpin_event(struct snd_soc_dapm_widget *w, return 0; } +static const char * const bypass_mux_text[] = { + "Internal", + "Alternative", +}; +static SOC_ENUM_SINGLE_DECL(bypass_enum, SND_SOC_NOPM, 0, bypass_mux_text); +static const struct snd_kcontrol_new bypass_ctrl = SOC_DAPM_ENUM("Switch", bypass_enum); + static const struct snd_soc_dapm_widget digital_hp_widgets[] = { + SND_SOC_DAPM_MUX("Bypass Switch", SND_SOC_NOPM, 0, 0, &bypass_ctrl), SND_SOC_DAPM_OUTPUT("HPOUTA"), SND_SOC_DAPM_OUTPUT("HPOUTB"), @@ -1419,13 +1427,13 @@ static const struct snd_soc_dapm_route digital_hp_routes[] = { {"DSD", NULL, "XSPIN DSD"}, {"HiFi DAC", NULL, "ASPIN PCM"}, {"HiFi DAC", NULL, "DSD"}, - {"HPOUTA", NULL, "HiFi DAC"}, - {"HPOUTB", NULL, "HiFi DAC"}, + {"Bypass Switch", "Internal", "HiFi DAC"}, + {"HPOUTA", NULL, "Bypass Switch"}, + {"HPOUTB", NULL, "Bypass Switch"}, }; static const struct snd_soc_dapm_route analog_hp_routes[] = { - {"HPOUTA", NULL, "Analog Playback"}, - {"HPOUTB", NULL, "Analog Playback"}, + {"Bypass Switch", "Alternative", "Analog Playback"}, }; static struct snd_soc_dapm_route all_hp_routes[ |