diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2010-04-29 03:58:09 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-05-03 07:47:30 -0400 |
commit | 1b7c9afbfbfde93d4da89dcebfd2314f7d79c064 (patch) | |
tree | cbde067de6f8640312cf132b1d0aca792aa9b9c1 | |
parent | 7b4c734eead5ef0b1c95ec336ddd28e58e648676 (diff) |
ASoC: TWL4030: Remove OUTL/R outputs
OUTL/R are leftovers from the original driver, and they
are no longer needed.
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>
-rw-r--r-- | sound/soc/codecs/twl4030.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 12931f6d445b..b717a03dfacf 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -1194,8 +1194,6 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
1194 | SND_SOC_DAPM_INPUT("DIGIMIC1"), | 1194 | SND_SOC_DAPM_INPUT("DIGIMIC1"), |
1195 | 1195 | ||
1196 | /* Outputs */ | 1196 | /* Outputs */ |
1197 | SND_SOC_DAPM_OUTPUT("OUTL"), | ||
1198 | SND_SOC_DAPM_OUTPUT("OUTR"), | ||
1199 | SND_SOC_DAPM_OUTPUT("EARPIECE"), | 1197 | SND_SOC_DAPM_OUTPUT("EARPIECE"), |
1200 | SND_SOC_DAPM_OUTPUT("PREDRIVEL"), | 1198 | SND_SOC_DAPM_OUTPUT("PREDRIVEL"), |
1201 | SND_SOC_DAPM_OUTPUT("PREDRIVER"), | 1199 | SND_SOC_DAPM_OUTPUT("PREDRIVER"), |
@@ -1487,8 +1485,6 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
1487 | /* Must be always connected (for APLL) */ | 1485 | /* Must be always connected (for APLL) */ |
1488 | {"Virtual Voice OUT", NULL, "Digital Voice Playback Mixer"}, | 1486 | {"Virtual Voice OUT", NULL, "Digital Voice Playback Mixer"}, |
1489 | /* Physical outputs */ | 1487 | /* Physical outputs */ |
1490 | {"OUTL", NULL, "Analog L2 Playback Mixer"}, | ||
1491 | {"OUTR", NULL, "Analog R2 Playback Mixer"}, | ||
1492 | {"EARPIECE", NULL, "Earpiece PGA"}, | 1488 | {"EARPIECE", NULL, "Earpiece PGA"}, |
1493 | {"PREDRIVEL", NULL, "PredriveL PGA"}, | 1489 | {"PREDRIVEL", NULL, "PredriveL PGA"}, |
1494 | {"PREDRIVER", NULL, "PredriveR PGA"}, | 1490 | {"PREDRIVER", NULL, "PredriveR PGA"}, |