aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-03 11:28:34 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-03 11:28:34 +0000
commitbe551c5dcc130a3ea536b2e53b4c6d80301c3802 (patch)
tree59b2613df8781d0fb85484e9dc2f091ac5a45214 /include
parent178220968eee1aaeb854bcd9ec12006ccaad621c (diff)
ASoC: Add Openmoko state file compatibility for DAPM switches
Openmoko had similar controls with "DAPM " prefixed to them - add that back to maintain compatibility with existing ALSA state files. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-dapm.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 3cc7d57981d..40e764fa95d 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -182,8 +182,11 @@
.get = snd_soc_dapm_get_value_enum_double, \
.put = snd_soc_dapm_put_value_enum_double, \
.private_value = (unsigned long)&xenum }
+/* NOTE: Openmoko-specific "DAPM " prefix added to controls for
+ * backwards compatibility.
+ */
#define SOC_DAPM_PIN_SWITCH(xname) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "DAPM " xname " Switch", \
.info = snd_soc_dapm_info_pin_switch, \
.get = snd_soc_dapm_get_pin_switch, \
.put = snd_soc_dapm_put_pin_switch, \