Merge tag 'driver-core-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / sound / soc / codecs / wm8962.c

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index ba16bdf..2c41d31 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2049,6 +2049,13 @@ static SOC_ENUM_SINGLE_DECL(hpoutl_enum,
 static const struct snd_kcontrol_new hpoutl_mux =
        SOC_DAPM_ENUM("HPOUTL Mux", hpoutl_enum);
 
+static const char * const input_mode_text[] = { "Analog", "Digital" };
+
+static SOC_ENUM_SINGLE_VIRT_DECL(input_mode_enum, input_mode_text);
+
+static const struct snd_kcontrol_new input_mode_mux =
+       SOC_DAPM_ENUM("Input Mode", input_mode_enum);
+
 static const struct snd_kcontrol_new inpgal[] = {
 SOC_DAPM_SINGLE("IN1L Switch", WM8962_LEFT_INPUT_PGA_CONTROL, 3, 1, 0),
 SOC_DAPM_SINGLE("IN2L Switch", WM8962_LEFT_INPUT_PGA_CONTROL, 2, 1, 0),
@@ -2147,6 +2154,9 @@ SND_SOC_DAPM_MIXER("MIXINR", WM8962_PWR_MGMT_1, 4, 0,
 
 SND_SOC_DAPM_AIF_IN("DMIC_ENA", NULL, 0, WM8962_PWR_MGMT_1, 10, 0),
 
+SND_SOC_DAPM_MUX("Input Mode L", SND_SOC_NOPM, 0, 0, &input_mode_mux),
+SND_SOC_DAPM_MUX("Input Mode R", SND_SOC_NOPM, 0, 0, &input_mode_mux),
+
 SND_SOC_DAPM_ADC("ADCL", "Capture", WM8962_PWR_MGMT_1, 3, 0),
 SND_SOC_DAPM_ADC("ADCR", "Capture", WM8962_PWR_MGMT_1, 2, 0),
 
@@ -2226,16 +2236,19 @@ static const struct snd_soc_dapm_route wm8962_intercon[] = {
 
        { "DMIC_ENA", NULL, "DMICDAT" },
 
+       { "Input Mode L", "Analog", "MIXINL" },
+       { "Input Mode L", "Digital", "DMIC_ENA" },
+       { "Input Mode R", "Analog", "MIXINR" },
+       { "Input Mode R", "Digital", "DMIC_ENA" },
+
        { "ADCL", NULL, "SYSCLK" },
        { "ADCL", NULL, "TOCLK" },
-       { "ADCL", NULL, "MIXINL" },
-       { "ADCL", NULL, "DMIC_ENA" },
+       { "ADCL", NULL, "Input Mode L" },
        { "ADCL", NULL, "DSP2" },
 
        { "ADCR", NULL, "SYSCLK" },
        { "ADCR", NULL, "TOCLK" },
-       { "ADCR", NULL, "MIXINR" },
-       { "ADCR", NULL, "DMIC_ENA" },
+       { "ADCR", NULL, "Input Mode R" },
        { "ADCR", NULL, "DSP2" },
 
        { "STL", "Left", "ADCL" },
@@ -3538,9 +3551,8 @@ static int wm8962_set_pdata_from_of(struct i2c_client *i2c,
                                pdata->gpio_init[i] = 0x0;
                }
 
-       pdata->mclk = devm_clk_get(&i2c->dev, NULL);
-
-       return 0;
+       pdata->mclk = devm_clk_get_optional(&i2c->dev, NULL);
+       return PTR_ERR_OR_ZERO(pdata->mclk);
 }
 
 static int wm8962_i2c_probe(struct i2c_client *i2c,
@@ -3572,14 +3584,6 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
                        return ret;
        }
 
-       /* Mark the mclk pointer to NULL if no mclk assigned */
-       if (IS_ERR(wm8962->pdata.mclk)) {
-               /* But do not ignore the request for probe defer */
-               if (PTR_ERR(wm8962->pdata.mclk) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-               wm8962->pdata.mclk = NULL;
-       }
-
        for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++)
                wm8962->supplies[i].supply = wm8962_supply_names[i];