Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248282
b: refs/heads/master
c: ea0e60d
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Apr 13, 2011
1 parent 5267dc5 commit 3268ae8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 68688e78ed4bc8d1a811ca29e2f8681561706db3
refs/heads/master: ea0e60de385a984ab54d6694b03119d1706f548e
8 changes: 8 additions & 0 deletions trunk/sound/soc/samsung/speyside.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ static struct snd_soc_codec_conf speyside_codec_conf[] = {
},
};

static const struct snd_kcontrol_new controls[] = {
SOC_DAPM_PIN_SWITCH("Main Speaker"),
SOC_DAPM_PIN_SWITCH("Main DMIC"),
SOC_DAPM_PIN_SWITCH("Main AMIC"),
};

static struct snd_soc_dapm_widget widgets[] = {
SND_SOC_DAPM_HP("Headphone", NULL),
SND_SOC_DAPM_MIC("Headset Mic", NULL),
Expand Down Expand Up @@ -238,6 +244,8 @@ static struct snd_soc_card speyside = {

.set_bias_level = speyside_set_bias_level,

.controls = controls,
.num_controls = ARRAY_SIZE(controls),
.dapm_widgets = widgets,
.num_dapm_widgets = ARRAY_SIZE(widgets),
.dapm_routes = audio_paths,
Expand Down

0 comments on commit 3268ae8

Please sign in to comment.