aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-12 03:09:53 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-13 13:02:12 -0400
commitea0e60de385a984ab54d6694b03119d1706f548e (patch)
tree7f79eff61c781b50a9c45bea7e230bf96de905ec /sound/soc/samsung
parent68688e78ed4bc8d1a811ca29e2f8681561706db3 (diff)
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 <broonie@opensource.wolfsonmicro.com> Acked-by: Jassi Brar <jassisinghbrar@gmail.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/speyside.c8
1 files changed, 8 insertions, 0 deletions
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[] = {
190 }, 190 },
191}; 191};
192 192
193static const struct snd_kcontrol_new controls[] = {
194 SOC_DAPM_PIN_SWITCH("Main Speaker"),
195 SOC_DAPM_PIN_SWITCH("Main DMIC"),
196 SOC_DAPM_PIN_SWITCH("Main AMIC"),
197};
198
193static struct snd_soc_dapm_widget widgets[] = { 199static struct snd_soc_dapm_widget widgets[] = {
194 SND_SOC_DAPM_HP("Headphone", NULL), 200 SND_SOC_DAPM_HP("Headphone", NULL),
195 SND_SOC_DAPM_MIC("Headset Mic", NULL), 201 SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -238,6 +244,8 @@ static struct snd_soc_card speyside = {
238 244
239 .set_bias_level = speyside_set_bias_level, 245 .set_bias_level = speyside_set_bias_level,
240 246
247 .controls = controls,
248 .num_controls = ARRAY_SIZE(controls),
241 .dapm_widgets = widgets, 249 .dapm_widgets = widgets,
242 .num_dapm_widgets = ARRAY_SIZE(widgets), 250 .num_dapm_widgets = ARRAY_SIZE(widgets),
243 .dapm_routes = audio_paths, 251 .dapm_routes = audio_paths,