ASoC: Move IO abstraction to the component level

We currently have two very similar IO abstractions in ASoC, one for CODECs, the
other for platforms. Moving this to the component level will allow us to unify
those two. It will also enable us to move the standard kcontrol helpers as well
as DAPM support to the component level.

The new component level abstraction layer is primarily build around regmap.
There is a per component pointer for the regmap instance for the underlying
device. There are four new function snd_soc_component_read(),
snd_soc_component_write(), snd_soc_component_update_bits() and
snd_soc_component_update_bits_async(). They have the same signature as their
regmap counter-part and will internally forward the call one-to-one to regmap.
If the component it not using regmap it will fallback to using the custom IO
callbacks. This is done to be able to support drivers that haven't been
converted to regmap yet, but it is expected that this will eventually be removed
in the future once all component drivers have been converted to regmap.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 11 insertions, 73 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f4ba7b40a6ab..da266e1e61b0 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -379,86 +379,24 @@ static void dapm_reset(struct snd_soc_card *card)
 static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg,
         unsigned int *value)
 {
-        if (w->codec) {
-                *value = snd_soc_read(w->codec, reg);
-                return 0;
-        } else if (w->platform) {
-                *value = snd_soc_platform_read(w->platform, reg);
-                return 0;
-        }
-
-        dev_err(w->dapm->dev, "ASoC: no valid widget read method\n");
-        return -1;
-}
-
-static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg,
-        unsigned int val)
-{
-        if (w->codec)
-                return snd_soc_write(w->codec, reg, val);
-        else if (w->platform)
-                return snd_soc_platform_write(w->platform, reg, val);
-
-        dev_err(w->dapm->dev, "ASoC: no valid widget write method\n");
-        return -1;
-}
-
-static inline void soc_widget_lock(struct snd_soc_dapm_widget *w)
-{
-        if (w->codec && !w->codec->using_regmap)
-                mutex_lock(&w->codec->mutex);
-        else if (w->platform)
-                mutex_lock(&w->platform->mutex);
+        if (!w->dapm->component)
+                return -EIO;
+        return snd_soc_component_read(w->dapm->component, reg, value);
 }
 
-static inline void soc_widget_unlock(struct snd_soc_dapm_widget *w)
+static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
+        int reg, unsigned int mask, unsigned int value)
 {
-        if (w->codec && !w->codec->using_regmap)
-                mutex_unlock(&w->codec->mutex);
-        else if (w->platform)
-                mutex_unlock(&w->platform->mutex);
+        if (!w->dapm->component)
+                return -EIO;
+        return snd_soc_component_update_bits_async(w->dapm->component, reg,
+                mask, value);
 }
 
 static void soc_dapm_async_complete(struct snd_soc_dapm_context *dapm)
 {
-        if (dapm->codec && dapm->codec->using_regmap)
-                regmap_async_complete(dapm->codec->control_data);
-}
-
-static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
-        int reg, unsigned int mask, unsigned int value)
-{
-        bool change;
-        unsigned int old, new;
-        int ret;
-
-        if (w->codec && w->codec->using_regmap) {
-                ret = regmap_update_bits_check_async(w->codec->control_data,
-                                                     reg, mask, value,
-                                                     &change);
-                if (ret != 0)
-                        return ret;
-        } else {
-                soc_widget_lock(w);
-                ret = soc_widget_read(w, reg, &old);
-                if (ret < 0) {
-                        soc_widget_unlock(w);
-                        return ret;
-                }
-
-                new = (old & ~mask) | (value & mask);
-                change = old != new;
-                if (change) {
-                        ret = soc_widget_write(w, reg, new);
-                        if (ret < 0) {
-                                soc_widget_unlock(w);
-                                return ret;
-                        }
-                }
-                soc_widget_unlock(w);
-        }
-
-        return change;
+        if (dapm->component)
+                snd_soc_component_async_complete(dapm->component);
 }
 
 /**