diff --git a/[refs] b/[refs] index abfb1027b407..7a88d780e354 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68688e78ed4bc8d1a811ca29e2f8681561706db3 +refs/heads/master: ea0e60de385a984ab54d6694b03119d1706f548e diff --git a/trunk/sound/soc/samsung/speyside.c b/trunk/sound/soc/samsung/speyside.c index 612a39e0e108..e171a321889f 100644 --- a/trunk/sound/soc/samsung/speyside.c +++ b/trunk/sound/soc/samsung/speyside.c @@ -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), @@ -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,