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 <lrg@slimlogic.co.uk> with some
minor core changes, codecs and machine driver conversions from
Jarkko Nikula <jhnikula@gmail.com>.

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Cliff Cai <cliff.cai@analog.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Ryan Mallon <ryan@bluewatersys.com>
Cc: Timur Tabi <timur@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Jassi Brar <jassi.brar@samsung.com>
Cc: Daniel Gloeckner <dg@emlix.com>
Cc: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 2b07b17a6b2d..a2cf64b221e5 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -132,26 +132,27 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         /* Add davinci-evm specific widgets */
-        snd_soc_dapm_new_controls(codec, aic3x_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,
                                   ARRAY_SIZE(aic3x_dapm_widgets));
 
         /* Set up davinci-evm specific audio path audio_map */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* not connected */
-        snd_soc_dapm_disable_pin(codec, "MONO_LOUT");
-        snd_soc_dapm_disable_pin(codec, "HPLCOM");
-        snd_soc_dapm_disable_pin(codec, "HPRCOM");
+        snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");
+        snd_soc_dapm_disable_pin(dapm, "HPLCOM");
+        snd_soc_dapm_disable_pin(dapm, "HPRCOM");
 
         /* always connected */
-        snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-        snd_soc_dapm_enable_pin(codec, "Line Out");
-        snd_soc_dapm_enable_pin(codec, "Mic Jack");
-        snd_soc_dapm_enable_pin(codec, "Line In");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Line Out");
+        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+        snd_soc_dapm_enable_pin(dapm, "Line In");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }