summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2008-12-10 12:51:48 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-10 11:43:02 +0000
commit1e5fa31f96d558e53fe80e943305104bf4339711 (patch)
treebb90c5e926a60fd2a24d6f2e7e2557b6bc64d949 /sound/soc
parentd4a73131a56e906b8f65e20934516adcad68b524 (diff)
downloadop-kernel-dev-1e5fa31f96d558e53fe80e943305104bf4339711.zip
op-kernel-dev-1e5fa31f96d558e53fe80e943305104bf4339711.tar.gz
ASoC: TWL4030: Change the name for the DACs
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl4030.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index b321928..1377302 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -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 */
OpenPOWER on IntegriCloud