Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120283
b: refs/heads/master
c: 53b5047
h: refs/heads/master
i:
  120281: 79512eb
  120279: 7895cb9
v: v3
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Dec 9, 2008
1 parent bbce783 commit cc10bbf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 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: 28a1d869560a49d960ba2a3b450ec965712e5560
refs/heads/master: 53b5047d994edfcafabc0e95bb681ae70d6e8604
15 changes: 11 additions & 4 deletions trunk/sound/soc/codecs/twl4030.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,17 +616,24 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
SND_SOC_DAPM_OUTPUT("OUTL"),
SND_SOC_DAPM_OUTPUT("OUTR"),

SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0),
/* DACs */
SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
TWL4030_REG_AVDAC_CTL, 0, 0),
SND_SOC_DAPM_DAC("DACL1", "Left Front Playback",
TWL4030_REG_AVDAC_CTL, 1, 0),
SND_SOC_DAPM_DAC("DACR2", "Right Rear Playback",
TWL4030_REG_AVDAC_CTL, 2, 0),
SND_SOC_DAPM_DAC("DACL2", "Left Rear Playback",
TWL4030_REG_AVDAC_CTL, 3, 0),

SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
};

static const struct snd_soc_dapm_route intercon[] = {
/* outputs */
{"OUTL", NULL, "DACL"},
{"OUTR", NULL, "DACR"},
{"OUTL", NULL, "DACL2"},
{"OUTR", NULL, "DACR2"},

/* inputs */
{"ADCL", NULL, "INL"},
Expand Down

0 comments on commit cc10bbf

Please sign in to comment.