Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 111050
b: refs/heads/master
c: ccbc301
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Jaroslav Kysela committed Sep 23, 2008
1 parent cf6e915 commit 45ff580
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 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: db845374e9ba0711e2547477c23d652c15627ac5
refs/heads/master: ccbc301e5346e115931ab052837d32778f8fd544
12 changes: 10 additions & 2 deletions trunk/sound/soc/codecs/wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,12 @@ SND_SOC_DAPM_MIXER("Line Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_MIXER("Capture Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_DAC("Voice DAC", "Voice Playback", AC97_EXTENDED_MID, 12, 1),
SND_SOC_DAPM_DAC("Aux DAC", "Aux Playback", AC97_EXTENDED_MID, 11, 1),
SND_SOC_DAPM_ADC("Left ADC", "Left HiFi Capture", AC97_EXTENDED_MID, 5, 1),
SND_SOC_DAPM_ADC("Right ADC", "Right HiFi Capture", AC97_EXTENDED_MID, 4, 1),
SND_SOC_DAPM_PGA("Left ADC", AC97_EXTENDED_MID, 5, 1, NULL, 0),
SND_SOC_DAPM_PGA("Right ADC", AC97_EXTENDED_MID, 4, 1, NULL, 0),
SND_SOC_DAPM_ADC("Left HiFi ADC", "Left HiFi Capture", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_ADC("Right HiFi ADC", "Right HiFi Capture", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_ADC("Left Voice ADC", "Left Voice Capture", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_ADC("Right Voice ADC", "Right Voice Capture", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_PGA("Left Headphone", AC97_EXTENDED_MSTATUS, 10, 1, NULL, 0),
SND_SOC_DAPM_PGA("Right Headphone", AC97_EXTENDED_MSTATUS, 9, 1, NULL, 0),
SND_SOC_DAPM_PGA("Left Speaker", AC97_EXTENDED_MSTATUS, 8, 1, NULL, 0),
Expand Down Expand Up @@ -583,9 +587,13 @@ static const struct snd_soc_dapm_route audio_map[] = {

/* left ADC */
{"Left ADC", NULL, "Left Capture Source"},
{"Left Voice ADC", NULL, "Left ADC"},
{"Left HiFi ADC", NULL, "Left ADC"},

/* right ADC */
{"Right ADC", NULL, "Right Capture Source"},
{"Right Voice ADC", NULL, "Right ADC"},
{"Right HiFi ADC", NULL, "Right ADC"},

/* mic */
{"Mic A Pre Amp", NULL, "Mic A Source"},
Expand Down

0 comments on commit 45ff580

Please sign in to comment.