From: Mark Brown Date: Tue, 12 Apr 2011 07:09:53 +0000 (-0700) Subject: ASoC: Add pin switches for fixed analogue inputs and outputs on Speyside X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ea0e60de385a984ab54d6694b03119d1706f548e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ASoC: Add pin switches for fixed analogue inputs and outputs on Speyside Pin switches enable direct control of the DAPM state from userspace, enabling simple enabling and disabling of the path. This is especially useful for outputs such as the speaker which are composed of several physical devices as it allows them to be controlled as a group. Signed-off-by: Mark Brown Acked-by: Jassi Brar Acked-by: Liam Girdwood --- diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 612a39e0e108..e171a321889f 100644 --- a/sound/soc/samsung/speyside.c +++ b/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,