diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-05 09:53:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 11:28:29 -0400 |
| commit | ce6120cca2589ede530200c7cfe11ac9f144333c (patch) | |
| tree | 6ea7c26ce64dd4753e7cf9a3b048e74614b169dc /sound/soc/s3c24xx/jive_wm8750.c | |
| parent | 22e2fda5660cdf62513acabdb5c82a5af415f838 (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 <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>
Diffstat (limited to 'sound/soc/s3c24xx/jive_wm8750.c')
| -rw-r--r-- | sound/soc/s3c24xx/jive_wm8750.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 49605cd8394..e3599e28356 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c | |||
| @@ -111,18 +111,19 @@ static struct snd_soc_ops jive_ops = { | |||
| 111 | static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd) | 111 | static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd) |
| 112 | { | 112 | { |
| 113 | struct snd_soc_codec *codec = rtd->codec; | 113 | struct snd_soc_codec *codec = rtd->codec; |
| 114 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
| 114 | int err; | 115 | int err; |
| 115 | 116 | ||
| 116 | /* These endpoints are not being used. */ | 117 | /* These endpoints are not being used. */ |
| 117 | snd_soc_dapm_nc_pin(codec, "LINPUT2"); | 118 | snd_soc_dapm_nc_pin(dapm, "LINPUT2"); |
| 118 | snd_soc_dapm_nc_pin(codec, "RINPUT2"); | 119 | snd_soc_dapm_nc_pin(dapm, "RINPUT2"); |
| 119 | snd_soc_dapm_nc_pin(codec, "LINPUT3"); | 120 | snd_soc_dapm_nc_pin(dapm, "LINPUT3"); |
| 120 | snd_soc_dapm_nc_pin(codec, "RINPUT3"); | 121 | snd_soc_dapm_nc_pin(dapm, "RINPUT3"); |
| 121 | snd_soc_dapm_nc_pin(codec, "OUT3"); | 122 | snd_soc_dapm_nc_pin(dapm, "OUT3"); |
| 122 | snd_soc_dapm_nc_pin(codec, "MONO"); | 123 | snd_soc_dapm_nc_pin(dapm, "MONO"); |
| 123 | 124 | ||
| 124 | /* Add jive specific widgets */ | 125 | /* Add jive specific widgets */ |
| 125 | err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets, | 126 | err = snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets, |
| 126 | ARRAY_SIZE(wm8750_dapm_widgets)); | 127 | ARRAY_SIZE(wm8750_dapm_widgets)); |
| 127 | if (err) { | 128 | if (err) { |
| 128 | printk(KERN_ERR "%s: failed to add widgets (%d)\n", | 129 | printk(KERN_ERR "%s: failed to add widgets (%d)\n", |
| @@ -130,8 +131,8 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd) | |||
| 130 | return err; | 131 | return err; |
| 131 | } | 132 | } |
| 132 | 133 | ||
| 133 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 134 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
| 134 | snd_soc_dapm_sync(codec); | 135 | snd_soc_dapm_sync(dapm); |
| 135 | 136 | ||
| 136 | return 0; | 137 | return 0; |
| 137 | } | 138 | } |