aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-08 13:18:19 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-08 13:18:19 -0400
commit22df8eb4fe293d67c98732e02a2dbef0d9c6cd96 (patch)
tree0167b8ca82bf81869536b6961b2417ac690cbb19
parent2a01e5f3587be459c934d711bffddc14d66386f3 (diff)
ASoC: Disable microphone input for AT91SAM9G20-EK by default
As shipped the board does not have inputs but it is relatively straightforward to modify the board to hook them up so support is provided in the driver. When these modifications have not been made enabling the microphone stage can cause problems. Add an ifdef to disable this by default. Don't put it into Kconfig since users will have to get their soldering irons out to change things. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 9abab94fe2c4..ba93df79f265 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -56,6 +56,13 @@
56 56
57#define MCLK_RATE 12000000 57#define MCLK_RATE 12000000
58 58
59/*
60 * As shipped the board does not have inputs. However, it is relatively
61 * straightforward to modify the board to hook them up so support is left
62 * in the driver.
63 */
64#undef ENABLE_MIC_INPUT
65
59static struct clk *mclk; 66static struct clk *mclk;
60 67
61static int at91sam9g20ek_startup(struct snd_pcm_substream *substream) 68static int at91sam9g20ek_startup(struct snd_pcm_substream *substream)
@@ -170,8 +177,13 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_codec *codec)
170 snd_soc_dapm_nc_pin(codec, "RLINEIN"); 177 snd_soc_dapm_nc_pin(codec, "RLINEIN");
171 snd_soc_dapm_nc_pin(codec, "LLINEIN"); 178 snd_soc_dapm_nc_pin(codec, "LLINEIN");
172 179
173 /* always connected */ 180#ifdef ENABLE_MIC_INPUT
174 snd_soc_dapm_enable_pin(codec, "Int Mic"); 181 snd_soc_dapm_enable_pin(codec, "Int Mic");
182#else
183 snd_soc_dapm_nc_pin(codec, "Int Mic");
184#endif
185
186 /* always connected */
175 snd_soc_dapm_enable_pin(codec, "Ext Spk"); 187 snd_soc_dapm_enable_pin(codec, "Ext Spk");
176 188
177 snd_soc_dapm_sync(codec); 189 snd_soc_dapm_sync(codec);