Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 157562
b: refs/heads/master
c: 22df8eb
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Jul 8, 2009
1 parent 3a87321 commit 70392a1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a01e5f3587be459c934d711bffddc14d66386f3
refs/heads/master: 22df8eb4fe293d67c98732e02a2dbef0d9c6cd96
14 changes: 13 additions & 1 deletion trunk/sound/soc/atmel/sam9g20_wm8731.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 70392a1

Please sign in to comment.