ASoC: tlv320dac33: Rename outpup amplifier widget
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Wed, 8 Dec 2010 14:04:32 +0000 (16:04 +0200)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Thu, 9 Dec 2010 09:31:35 +0000 (09:31 +0000)
Use better name for the widget, and remove the 'Power'
from it's name.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/tlv320dac33.c

index a0ba5d1..e2e873e 100644 (file)
@@ -599,9 +599,9 @@ static const struct snd_soc_dapm_widget dac33_dapm_widgets[] = {
        SND_SOC_DAPM_SWITCH("Analog Right Bypass", SND_SOC_NOPM, 0, 0,
                                &dac33_dapm_abypassr_control),
 
-       SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Left Amp Power",
+       SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Left Amplifier",
                         DAC33_OUT_AMP_PWR_CTRL, 6, 3, 3, 0),
-       SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Right Amp Power",
+       SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Right Amplifier",
                         DAC33_OUT_AMP_PWR_CTRL, 4, 3, 3, 0),
 
        SND_SOC_DAPM_PRE("Prepare Playback", playback_event),
@@ -612,15 +612,15 @@ static const struct snd_soc_dapm_route audio_map[] = {
        {"Analog Left Bypass", "Switch", "LINEL"},
        {"Analog Right Bypass", "Switch", "LINER"},
 
-       {"Output Left Amp Power", NULL, "DACL"},
-       {"Output Right Amp Power", NULL, "DACR"},
+       {"Output Left Amplifier", NULL, "DACL"},
+       {"Output Right Amplifier", NULL, "DACR"},
 
-       {"Output Left Amp Power", NULL, "Analog Left Bypass"},
-       {"Output Right Amp Power", NULL, "Analog Right Bypass"},
+       {"Output Left Amplifier", NULL, "Analog Left Bypass"},
+       {"Output Right Amplifier", NULL, "Analog Right Bypass"},
 
        /* output */
-       {"LEFT_LO", NULL, "Output Left Amp Power"},
-       {"RIGHT_LO", NULL, "Output Right Amp Power"},
+       {"LEFT_LO", NULL, "Output Left Amplifier"},
+       {"RIGHT_LO", NULL, "Output Right Amplifier"},
 };
 
 static int dac33_add_widgets(struct snd_soc_codec *codec)