path: root/sound/soc/ep93xx/snappercl15.c
diff options
authorLiam Girdwood <>2010-11-05 15:53:46 +0200
committerMark Brown <>2010-11-06 11:28:29 -0400
commitce6120cca2589ede530200c7cfe11ac9f144333c (patch)
tree6ea7c26ce64dd4753e7cf9a3b048e74614b169dc /sound/soc/ep93xx/snappercl15.c
parent22e2fda5660cdf62513acabdb5c82a5af415f838 (diff)
ASoC: Decouple DAPM from CODECs
Decoupling Dynamic Audio Power Management (DAPM) from codec devices is required when developing ASoC further. Such as for other ASoC components to have DAPM widgets or when extending DAPM to handle cross-device paths. This patch decouples DAPM related variables from struct snd_soc_codec and moves them to new struct snd_soc_dapm_context that is used to encapsulate DAPM context of a device. ASoC core and API of DAPM functions are modified to use DAPM context instead of codec. This patch does not change current functionality and a large part of changes come because of structure and internal API changes. Core implementation is from Liam Girdwood <> with some minor core changes, codecs and machine driver conversions from Jarkko Nikula <>. Signed-off-by: Liam Girdwood <> Signed-off-by: Jarkko Nikula <> Cc: Nicolas Ferre <> Cc: Manuel Lauss <> Cc: Mike Frysinger <> Cc: Cliff Cai <> Cc: Kevin Hilman <> Cc: Ryan Mallon <> Cc: Timur Tabi <> Cc: Sascha Hauer <> Cc: Lars-Peter Clausen <> Cc: Arnaud Patard (Rtp) <> Cc: Wan ZongShun <> Cc: Eric Miao <> Cc: Jassi Brar <> Cc: Daniel Gloeckner <> Cc: Kuninori Morimoto <> Signed-off-by: Mark Brown <>
Diffstat (limited to 'sound/soc/ep93xx/snappercl15.c')
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index 28ab5ff772ac..f1c78516ccac 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -79,11 +79,12 @@ static const struct snd_soc_dapm_route audio_map[] = {
static int snappercl15_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
- snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
+ snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
- snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+ snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
return 0;