]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ASoC: TWL4030: Change the name for the DACs
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Wed, 10 Dec 2008 10:51:48 +0000 (12:51 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Dec 2008 11:43:02 +0000 (11:43 +0000)
To avoid confusion the names for the DACs changed:
DACL1 -> DAC Left1
...

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/twl4030.c

index b321928152d1ddb4ecdc6f65eaaf51fae5f631ef..13773028f6f16840fe3cfd664f4e4d29766388b0 100644 (file)
@@ -764,13 +764,13 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
        SND_SOC_DAPM_OUTPUT("HFR"),
 
        /* DACs */
-       SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
+       SND_SOC_DAPM_DAC("DAC Right1", "Right Front Playback",
                        TWL4030_REG_AVDAC_CTL, 0, 0),
-       SND_SOC_DAPM_DAC("DACL1", "Left Front Playback",
+       SND_SOC_DAPM_DAC("DAC Left1", "Left Front Playback",
                        TWL4030_REG_AVDAC_CTL, 1, 0),
-       SND_SOC_DAPM_DAC("DACR2", "Right Rear Playback",
+       SND_SOC_DAPM_DAC("DAC Right2", "Right Rear Playback",
                        TWL4030_REG_AVDAC_CTL, 2, 0),
-       SND_SOC_DAPM_DAC("DACL2", "Left Rear Playback",
+       SND_SOC_DAPM_DAC("DAC Left2", "Left Rear Playback",
                        TWL4030_REG_AVDAC_CTL, 3, 0),
 
        /* Analog PGAs */
@@ -816,10 +816,10 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
-       {"ARXL1_APGA", NULL, "DACL1"},
-       {"ARXR1_APGA", NULL, "DACR1"},
-       {"ARXL2_APGA", NULL, "DACL2"},
-       {"ARXR2_APGA", NULL, "DACR2"},
+       {"ARXL1_APGA", NULL, "DAC Left1"},
+       {"ARXR1_APGA", NULL, "DAC Right1"},
+       {"ARXL2_APGA", NULL, "DAC Left2"},
+       {"ARXR2_APGA", NULL, "DAC Right2"},
 
        /* Internal playback routings */
        /* Earpiece */