OSDN Git Service

ASoC: max9867: add digital microphone controls
authorPavel Dobias <dobias@2n.cz>
Fri, 22 May 2020 14:29:56 +0000 (16:29 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 22 May 2020 18:14:07 +0000 (19:14 +0100)
MAX9867 codec has a possibility of connecting digital microphones.
Add DAPM controls to be able to enable them.

Signed-off-by: Pavel Dobias <dobias@2n.cz>
Link: https://lore.kernel.org/r/20200522142957.18364-2-dobias@2n.cz
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/max9867.c

index f100070..93dd3d4 100644 (file)
@@ -104,10 +104,24 @@ static const struct snd_kcontrol_new max9867_line_out_control =
        SOC_DAPM_DOUBLE_R("Switch",
                          MAX9867_LEFTVOL, MAX9867_RIGHTVOL, 6, 1, 1);
 
+/* DMIC mux */
+static const char *const dmic_mux_text[] = {
+       "ADC", "DMIC"
+};
+static SOC_ENUM_SINGLE_DECL(left_dmic_mux_enum,
+                           MAX9867_MICCONFIG, 5, dmic_mux_text);
+static SOC_ENUM_SINGLE_DECL(right_dmic_mux_enum,
+                           MAX9867_MICCONFIG, 4, dmic_mux_text);
+static const struct snd_kcontrol_new max9867_left_dmic_mux =
+       SOC_DAPM_ENUM("DMICL Mux", left_dmic_mux_enum);
+static const struct snd_kcontrol_new max9867_right_dmic_mux =
+       SOC_DAPM_ENUM("DMICR Mux", right_dmic_mux_enum);
 
 static const struct snd_soc_dapm_widget max9867_dapm_widgets[] = {
        SND_SOC_DAPM_INPUT("MICL"),
        SND_SOC_DAPM_INPUT("MICR"),
+       SND_SOC_DAPM_INPUT("DMICL"),
+       SND_SOC_DAPM_INPUT("DMICR"),
        SND_SOC_DAPM_INPUT("LINL"),
        SND_SOC_DAPM_INPUT("LINR"),
 
@@ -116,6 +130,10 @@ static const struct snd_soc_dapm_widget max9867_dapm_widgets[] = {
        SND_SOC_DAPM_MIXER_NAMED_CTL("Input Mixer", SND_SOC_NOPM, 0, 0,
                                     max9867_input_mixer_controls,
                                     ARRAY_SIZE(max9867_input_mixer_controls)),
+       SND_SOC_DAPM_MUX("DMICL Mux", SND_SOC_NOPM, 0, 0,
+                        &max9867_left_dmic_mux),
+       SND_SOC_DAPM_MUX("DMICR Mux", SND_SOC_NOPM, 0, 0,
+                        &max9867_right_dmic_mux),
        SND_SOC_DAPM_ADC("ADCL", "HiFi Capture", MAX9867_PWRMAN, 1, 0),
        SND_SOC_DAPM_ADC("ADCR", "HiFi Capture", MAX9867_PWRMAN, 0, 0),
 
@@ -140,8 +158,12 @@ static const struct snd_soc_dapm_route max9867_audio_map[] = {
        {"Input Mixer", "Mic Capture Switch", "MICR"},
        {"Input Mixer", "Line Capture Switch", "Left Line Input"},
        {"Input Mixer", "Line Capture Switch", "Right Line Input"},
-       {"ADCL", NULL, "Input Mixer"},
-       {"ADCR", NULL, "Input Mixer"},
+       {"DMICL Mux", "DMIC", "DMICL"},
+       {"DMICR Mux", "DMIC", "DMICR"},
+       {"DMICL Mux", "ADC", "Input Mixer"},
+       {"DMICR Mux", "ADC", "Input Mixer"},
+       {"ADCL", NULL, "DMICL Mux"},
+       {"ADCR", NULL, "DMICR Mux"},
 
        {"Digital", "Sidetone Switch", "ADCL"},
        {"Digital", "Sidetone Switch", "ADCR"},