ASoC: 88pm860x: Use regmap for I/O

As part of a move to remove the duplication of regmap functionality in ASoC
convert the 88pm860x driver to use the regmap from the MFD. This means that
we no longer cache the registers so performance will be slightly reduced
on I/O operations.

Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 5 insertions, 55 deletions

diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 3925cf34f751..4633e51b1500 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -16,6 +16,7 @@
 #include <linux/mfd/88pm860x.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -140,6 +141,7 @@ struct pm860x_priv {
         unsigned int            filter;
         struct snd_soc_codec    *codec;
         struct i2c_client       *i2c;
+        struct regmap           *regmap;
         struct pm860x_chip      *chip;
         struct pm860x_det       det;
 
@@ -269,48 +271,6 @@ static struct st_gain st_table[] = {
         {   -86, 29,  0}, {   -56, 30,  0}, {   -28, 31,  0}, {     0,  0,  0},
 };
 
-static int pm860x_volatile(unsigned int reg)
-{
-        BUG_ON(reg >= REG_CACHE_SIZE);
-
-        switch (reg) {
-        case PM860X_AUDIO_SUPPLIES_2:
-                return 1;
-        }
-
-        return 0;
-}
-
-static unsigned int pm860x_read_reg_cache(struct snd_soc_codec *codec,
-                                          unsigned int reg)
-{
-        unsigned char *cache = codec->reg_cache;
-
-        BUG_ON(reg >= REG_CACHE_SIZE);
-
-        if (pm860x_volatile(reg))
-                return cache[reg];
-
-        reg += REG_CACHE_BASE;
-
-        return pm860x_reg_read(codec->control_data, reg);
-}
-
-static int pm860x_write_reg_cache(struct snd_soc_codec *codec,
-                                  unsigned int reg, unsigned int value)
-{
-        unsigned char *cache = codec->reg_cache;
-
-        BUG_ON(reg >= REG_CACHE_SIZE);
-
-        if (!pm860x_volatile(reg))
-                cache[reg] = (unsigned char)value;
-
-        reg += REG_CACHE_BASE;
-
-        return pm860x_reg_write(codec->control_data, reg, value);
-}
-
 static int snd_soc_get_volsw_2r_st(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
@@ -1364,7 +1324,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 
         pm860x->codec = codec;
 
-        codec->control_data = pm860x->i2c;
+        codec->control_data = pm860x->regmap;
 
         for (i = 0; i < 4; i++) {
                 ret = request_threaded_irq(pm860x->irq[i], NULL,
@@ -1378,14 +1338,6 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 
         pm860x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        ret = pm860x_bulk_read(pm860x->i2c, REG_CACHE_BASE,
-                               REG_CACHE_SIZE, codec->reg_cache);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to fill register cache: %d\n",
-                        ret);
-                goto out;
-        }
-
         return 0;
 
 out:
@@ -1408,10 +1360,6 @@ static int pm860x_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_pm860x = {
         .probe          = pm860x_probe,
         .remove         = pm860x_remove,
-        .read           = pm860x_read_reg_cache,
-        .write          = pm860x_write_reg_cache,
-        .reg_cache_size = REG_CACHE_SIZE,
-        .reg_word_size  = sizeof(u8),
         .set_bias_level = pm860x_set_bias_level,
 
         .controls = pm860x_snd_controls,
@@ -1437,6 +1385,8 @@ static int pm860x_codec_probe(struct platform_device *pdev)
         pm860x->chip = chip;
         pm860x->i2c = (chip->id == CHIP_PM8607) ? chip->client
                         : chip->companion;
+        pm860x->regmap = (chip->id == CHIP_PM8607) ? chip->regmap
+                        : chip->regmap_companion;
         platform_set_drvdata(pdev, pm860x);
 
         for (i = 0; i < 4; i++) {