summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorGrazvydas Ignotas <notasas@gmail.com>2008-12-23 12:04:48 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-05 17:47:16 +0000
commit7f185340da2594d65520b26f41e706a3ad0a368c (patch)
tree602ca06ced6a64e0551a0c0e0095a4722bf0543f /sound
parentd304c6ef6e9888addde075acb5bdd87e3fb48c1a (diff)
downloadlinux-7f185340da2594d65520b26f41e706a3ad0a368c.tar.gz
linux-7f185340da2594d65520b26f41e706a3ad0a368c.tar.bz2
linux-7f185340da2594d65520b26f41e706a3ad0a368c.zip
ASoC: Mark non-connected TWL4030 pins for pandora
Pandora has all TWL4030 output pins floating, it uses external DAC for playback. Mark those outputs as not connected using DAPM calls. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap3pandora.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index bd91594496b1..fcc2f5d9a878 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -180,6 +180,19 @@ static int omap3pandora_in_init(struct snd_soc_codec *codec)
{
int ret;
+ /* All TWL4030 output pins are floating */
+ snd_soc_dapm_nc_pin(codec, "OUTL"),
+ snd_soc_dapm_nc_pin(codec, "OUTR"),
+ snd_soc_dapm_nc_pin(codec, "EARPIECE"),
+ snd_soc_dapm_nc_pin(codec, "PREDRIVEL"),
+ snd_soc_dapm_nc_pin(codec, "PREDRIVER"),
+ snd_soc_dapm_nc_pin(codec, "HSOL"),
+ snd_soc_dapm_nc_pin(codec, "HSOR"),
+ snd_soc_dapm_nc_pin(codec, "CARKITL"),
+ snd_soc_dapm_nc_pin(codec, "CARKITR"),
+ snd_soc_dapm_nc_pin(codec, "HFL"),
+ snd_soc_dapm_nc_pin(codec, "HFR"),
+
ret = snd_soc_dapm_new_controls(codec, omap3pandora_in_dapm_widgets,
ARRAY_SIZE(omap3pandora_in_dapm_widgets));
if (ret < 0)