From 70392a14e1ca54a938fe229dcdd2b1808a3435ef Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 8 Jul 2009 18:18:19 +0100
Subject: [PATCH] --- yaml --- r: 157562 b: refs/heads/master c:
 22df8eb4fe293d67c98732e02a2dbef0d9c6cd96 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/sound/soc/atmel/sam9g20_wm8731.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d64802071d08..7f402ea495a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a01e5f3587be459c934d711bffddc14d66386f3
+refs/heads/master: 22df8eb4fe293d67c98732e02a2dbef0d9c6cd96
diff --git a/trunk/sound/soc/atmel/sam9g20_wm8731.c b/trunk/sound/soc/atmel/sam9g20_wm8731.c
index 9abab94fe2c4..ba93df79f265 100644
--- a/trunk/sound/soc/atmel/sam9g20_wm8731.c
+++ b/trunk/sound/soc/atmel/sam9g20_wm8731.c
@@ -56,6 +56,13 @@
 
 #define MCLK_RATE 12000000
 
+/*
+ * As shipped the board does not have inputs.  However, it is relatively
+ * straightforward to modify the board to hook them up so support is left
+ * in the driver.
+ */
+#undef ENABLE_MIC_INPUT
+
 static struct clk *mclk;
 
 static int at91sam9g20ek_startup(struct snd_pcm_substream *substream)
@@ -170,8 +177,13 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_codec *codec)
 	snd_soc_dapm_nc_pin(codec, "RLINEIN");
 	snd_soc_dapm_nc_pin(codec, "LLINEIN");
 
-	/* always connected */
+#ifdef ENABLE_MIC_INPUT
 	snd_soc_dapm_enable_pin(codec, "Int Mic");
+#else
+	snd_soc_dapm_nc_pin(codec, "Int Mic");
+#endif
+
+	/* always connected */
 	snd_soc_dapm_enable_pin(codec, "Ext Spk");
 
 	snd_soc_dapm_sync(codec);