2 files changed, 14 insertions, 0 deletions

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index a7b1d77b2105..4f7f04014585 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -10,6 +10,7 @@ config SND_OMAP_SOC_N810
         tristate "SoC Audio support for Nokia N810"
         depends on SND_OMAP_SOC && MACH_NOKIA_N810
         select SND_OMAP_SOC_MCBSP
+        select OMAP_MUX
         select SND_SOC_TLV320AIC3X
         help
           Say Y if you want to add support for SoC audio on Nokia N810.
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)