From 7b85b03b7b901517bc75e82516c8e23a40e92068 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Tue, 23 Dec 2008 12:04:48 +0200 Subject: [PATCH] --- yaml --- r: 126779 b: refs/heads/master c: 7f185340da2594d65520b26f41e706a3ad0a368c h: refs/heads/master i: 126777: 0789dbbf76c8cb0f65fa487e71d36a031feb8d66 126775: b295d35501f460bef0a34e04fefa789c73e5009e v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap3pandora.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e09c2e199ee..93b841ce3117 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d304c6ef6e9888addde075acb5bdd87e3fb48c1a +refs/heads/master: 7f185340da2594d65520b26f41e706a3ad0a368c diff --git a/trunk/sound/soc/omap/omap3pandora.c b/trunk/sound/soc/omap/omap3pandora.c index bd91594496b1..fcc2f5d9a878 100644 --- a/trunk/sound/soc/omap/omap3pandora.c +++ b/trunk/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)