diff options
| author | Liam Girdwood <lrg@ti.com> | 2011-07-04 22:10:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-05 11:07:39 -0700 |
| commit | b7950641374ddb41e9a03ff61b43f9ab3fcf763d (patch) | |
| tree | afd469b165d71265caabb9070d24167419ad1f18 /sound/soc | |
| parent | a491a5c84f34febfebd4cb0b8c9add97977efa97 (diff) | |
ASoC: core - Add platform widget IO
Allow platform driver widgets to perform any IO required for DAPM.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 4 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 16651814ecb..38f954af7bb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -993,6 +993,7 @@ static int soc_probe_platform(struct snd_soc_card *card, const struct snd_soc_platform_driver *driver = platform->driver; platform->card = card; + platform->dapm.card = card; if (!try_module_get(platform->dev->driver->owner)) return -ENODEV; @@ -1010,6 +1011,7 @@ static int soc_probe_platform(struct snd_soc_card *card, /* mark platform as probed and add to card platform list */ platform->probed = 1; list_add(&platform->card_list, &card->platform_dev_list); + list_add(&platform->dapm.list, &card->dapm_list); return 0; @@ -3122,6 +3124,8 @@ int snd_soc_register_platform(struct device *dev, platform->dev = dev; platform->driver = platform_drv; + platform->dapm.dev = dev; + platform->dapm.platform = platform; mutex_lock(&client_mutex); list_add(&platform->list, &platform_list); diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index ceb2ba44fd3..54fa2e5e307 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -128,14 +128,22 @@ static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg) { if (w->codec) return snd_soc_read(w->codec, reg); - return 0; + else if (w->platform) + return snd_soc_platform_read(w->platform, reg); + + dev_err(w->dapm->dev, "no valid widget read method\n"); + return -1; } static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val) { if (w->codec) return snd_soc_write(w->codec, reg, val); - return 0; + else if (w->platform) + return snd_soc_platform_write(w->platform, reg, val); + + dev_err(w->dapm->dev, "no valid widget write method\n"); + return -1; } static int soc_widget_update_bits(struct snd_soc_dapm_widget *w, @@ -2495,6 +2503,7 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, dapm->n_widgets++; w->dapm = dapm; w->codec = dapm->codec; + w->platform = dapm->platform; INIT_LIST_HEAD(&w->sources); INIT_LIST_HEAD(&w->sinks); INIT_LIST_HEAD(&w->list); |