aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorHarsha Priya <priya.harsha@intel.com>2011-01-28 22:28:32 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-31 12:11:06 +0000
commitd316553a0cb4569a9b6260e870cab8b9c102eace (patch)
treefadace7f4a3987c95e6e1f042e4c7cce482842b9 /sound/soc
parenta7bffdf7d885197857bb04919344dc17ffaf79b9 (diff)
downloadkernel_samsung_aries-d316553a0cb4569a9b6260e870cab8b9c102eace.zip
kernel_samsung_aries-d316553a0cb4569a9b6260e870cab8b9c102eace.tar.gz
kernel_samsung_aries-d316553a0cb4569a9b6260e870cab8b9c102eace.tar.bz2
ASoC: mid-x86: Add support for capture in machine driver
This configures the capture unused pins Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Harsha Priya <priya.harsha@intel.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/mid-x86/mfld_machine.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 1a330be..7925851 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -182,6 +182,9 @@ static int mfld_init(struct snd_soc_pcm_runtime *runtime)
snd_soc_dapm_disable_pin(dapm, "LINEOUTR");
lo_dac = 3;
hs_switch = 0;
+ /* we dont use linein in this so set to NC */
+ snd_soc_dapm_disable_pin(dapm, "LINEINL");
+ snd_soc_dapm_disable_pin(dapm, "LINEINR");
return snd_soc_dapm_sync(dapm);
}