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, 36 insertions, 33 deletions

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index f470f360f4dd..0680b11c2685 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -46,61 +46,63 @@ static int spitz_spk_func;
 
 static void spitz_ext_control(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         if (spitz_spk_func == SPITZ_SPK_ON)
-                snd_soc_dapm_enable_pin(codec, "Ext Spk");
+                snd_soc_dapm_enable_pin(dapm, "Ext Spk");
         else
-                snd_soc_dapm_disable_pin(codec, "Ext Spk");
+                snd_soc_dapm_disable_pin(dapm, "Ext Spk");
 
         /* set up jack connection */
         switch (spitz_jack_func) {
         case SPITZ_HP:
                 /* enable and unmute hp jack, disable mic bias */
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Mic Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 1);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                 break;
         case SPITZ_MIC:
                 /* enable mic jack and bias, mute hp */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                snd_soc_dapm_enable_pin(codec, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin(dapm, "Mic Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         case SPITZ_LINE:
                 /* enable line jack, disable mic bias and mute hp */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Mic Jack");
-                snd_soc_dapm_enable_pin(codec, "Line Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_enable_pin(dapm, "Line Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         case SPITZ_HEADSET:
                 /* enable and unmute headset jack enable mic bias, mute L hp */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_enable_pin(codec, "Mic Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                snd_soc_dapm_enable_pin(codec, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headset Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                 break;
         case SPITZ_HP_OFF:
 
                 /* jack removed, everything off */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Mic Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         }
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 }
 
 static int spitz_startup(struct snd_pcm_substream *substream)
@@ -276,16 +278,17 @@ static const struct snd_kcontrol_new wm8750_spitz_controls[] = {
 static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* NC codec pins */
-        snd_soc_dapm_nc_pin(codec, "RINPUT1");
-        snd_soc_dapm_nc_pin(codec, "LINPUT2");
-        snd_soc_dapm_nc_pin(codec, "RINPUT2");
-        snd_soc_dapm_nc_pin(codec, "LINPUT3");
-        snd_soc_dapm_nc_pin(codec, "RINPUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "MONO1");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT1");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "MONO1");
 
         /* Add spitz specific controls */
         err = snd_soc_add_controls(codec, wm8750_spitz_controls,
@@ -294,13 +297,13 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
                 return err;
 
         /* Add spitz specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
                                   ARRAY_SIZE(wm8750_dapm_widgets));
 
         /* Set up spitz specific audio paths */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
         return 0;
 }