summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-02 19:21:57 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-03 12:15:16 +0100
commite37a4970cd7ab6aec9e848cd3c355fd47fd18afd (patch)
treec335b077c521e282a85ca83e9d50ad08c13e800a /include/sound
parentASoC: Check for a CODEC before dereferencing in DAPM (diff)
downloadlinux-e37a4970cd7ab6aec9e848cd3c355fd47fd18afd.tar.xz
linux-e37a4970cd7ab6aec9e848cd3c355fd47fd18afd.zip
ASoC: Add a per-card DAPM context
This means that rather than adding the board specific DAPM widgets to a random CODEC DAPM context they can be added to the card itself which is a bit cleaner. Previously there only was one DAPM context and it was tied to the single supported CODEC. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 65d865f7e8c0..8064cd130356 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -729,6 +729,9 @@ struct snd_soc_card {
struct list_head paths;
struct list_head dapm_list;
+ /* Generic DAPM context for the card */
+ struct snd_soc_dapm_context dapm;
+
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_card_root;
struct dentry *debugfs_pop_time;