From 375482561c66a4374b9938b70aab262237dc06ae Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 2 Dec 2011 17:36:06 +0000 Subject: [PATCH] --- yaml --- r: 283847 b: refs/heads/master c: 8f103167fecb1f4b5888fbcfc81b67e3c810dee0 h: refs/heads/master i: 283845: 39e5d980362d0fc2e65b79caa4ab57782d410839 283843: 049cd45c4e164380f69cc54efa92e8775f286a8b 283839: 3ea793093fc8088ccc8db3c7eac1f81dbea62186 v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/littlemill.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5a37bc248133..d722d2efcec1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91e20854e58075231c72a9c63d4454616787557e +refs/heads/master: 8f103167fecb1f4b5888fbcfc81b67e3c810dee0 diff --git a/trunk/sound/soc/samsung/littlemill.c b/trunk/sound/soc/samsung/littlemill.c index 5d7680f4b7c1..5cea59beec9f 100644 --- a/trunk/sound/soc/samsung/littlemill.c +++ b/trunk/sound/soc/samsung/littlemill.c @@ -147,11 +147,21 @@ static struct snd_soc_dai_link littlemill_dai[] = { static struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_HP("Headphone", NULL), + + SND_SOC_DAPM_MIC("AMIC", NULL), + SND_SOC_DAPM_MIC("DMIC", NULL), }; static struct snd_soc_dapm_route audio_paths[] = { { "Headphone", NULL, "HPOUT1L" }, { "Headphone", NULL, "HPOUT1R" }, + + { "AMIC", NULL, "MICBIAS1" }, /* Default for AMICBIAS jumper */ + { "IN1LN", NULL, "AMIC" }, + + { "DMIC", NULL, "MICBIAS2" }, /* Default for DMICBIAS jumper */ + { "DMIC1DAT", NULL, "DMIC" }, + { "DMIC2DAT", NULL, "DMIC" }, }; static struct snd_soc_jack littlemill_headset;