ASoC: Rename WM8962 DMIC widget to DMIC_ENA
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 15:39:31 +0000 (16:39 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 15:59:38 +0000 (16:59 +0100)
Matches the register name and avoids confusion with board widgets.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8962.c

index 3676b38838d87c1c6e73a80c895b3d2156377932..d26ec6daec03e0ab9a3ca973a9fbf640c73f8aa7 100644 (file)
@@ -2688,7 +2688,7 @@ SND_SOC_DAPM_MIXER("MIXINL", WM8962_PWR_MGMT_1, 5, 0,
 SND_SOC_DAPM_MIXER("MIXINR", WM8962_PWR_MGMT_1, 4, 0,
                   mixinr, ARRAY_SIZE(mixinr)),
 
-SND_SOC_DAPM_AIF_IN("DMIC", NULL, 0, WM8962_PWR_MGMT_1, 10, 0),
+SND_SOC_DAPM_AIF_IN("DMIC_ENA", NULL, 0, WM8962_PWR_MGMT_1, 10, 0),
 
 SND_SOC_DAPM_ADC("ADCL", "Capture", WM8962_PWR_MGMT_1, 3, 0),
 SND_SOC_DAPM_ADC("ADCR", "Capture", WM8962_PWR_MGMT_1, 2, 0),
@@ -2767,18 +2767,18 @@ static const struct snd_soc_dapm_route wm8962_intercon[] = {
 
        { "MICBIAS", NULL, "SYSCLK" },
 
-       { "DMIC", NULL, "DMICDAT" },
+       { "DMIC_ENA", NULL, "DMICDAT" },
 
        { "ADCL", NULL, "SYSCLK" },
        { "ADCL", NULL, "TOCLK" },
        { "ADCL", NULL, "MIXINL" },
-       { "ADCL", NULL, "DMIC" },
+       { "ADCL", NULL, "DMIC_ENA" },
        { "ADCL", NULL, "DSP2" },
 
        { "ADCR", NULL, "SYSCLK" },
        { "ADCR", NULL, "TOCLK" },
        { "ADCR", NULL, "MIXINR" },
-       { "ADCR", NULL, "DMIC" },
+       { "ADCR", NULL, "DMIC_ENA" },
        { "ADCR", NULL, "DSP2" },
 
        { "STL", "Left", "ADCL" },