1 files changed, 96 insertions, 100 deletions

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 2727befd158e..7e2194975360 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/spi/spi.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -48,7 +49,6 @@
 struct ssm2602_priv {
         unsigned int sysclk;
         enum snd_soc_control_type control_type;
-        void *control_data;
         struct snd_pcm_substream *master_substream;
         struct snd_pcm_substream *slave_substream;
 };
@@ -65,55 +65,7 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = {
         0x0000, 0x0000
 };
 
-/*
- * read ssm2602 register cache
- */
-static inline unsigned int ssm2602_read_reg_cache(struct snd_soc_codec *codec,
-        unsigned int reg)
-{
-        u16 *cache = codec->reg_cache;
-        if (reg == SSM2602_RESET)
-                return 0;
-        if (reg >= SSM2602_CACHEREGNUM)
-                return -1;
-        return cache[reg];
-}
-
-/*
- * write ssm2602 register cache
- */
-static inline void ssm2602_write_reg_cache(struct snd_soc_codec *codec,
-        u16 reg, unsigned int value)
-{
-        u16 *cache = codec->reg_cache;
-        if (reg >= SSM2602_CACHEREGNUM)
-                return;
-        cache[reg] = value;
-}
-
-/*
- * write to the ssm2602 register space
- */
-static int ssm2602_write(struct snd_soc_codec *codec, unsigned int reg,
-        unsigned int value)
-{
-        u8 data[2];
-
-        /* data is
-         *   D15..D9 ssm2602 register offset
-         *   D8...D0 register data
-         */
-        data[0] = (reg << 1) | ((value >> 8) & 0x0001);
-        data[1] = value & 0x00ff;
-
-        ssm2602_write_reg_cache(codec, reg, value);
-        if (codec->hw_write(codec->control_data, data, 2) == 2)
-                return 0;
-        else
-                return -EIO;
-}
-
-#define ssm2602_reset(c)        ssm2602_write(c, SSM2602_RESET, 0)
+#define ssm2602_reset(c)        snd_soc_write(c, SSM2602_RESET, 0)
 
 /*Appending several "None"s just for OSS mixer use*/
 static const char *ssm2602_input_select[] = {
@@ -278,12 +230,11 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
         struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
-        struct i2c_client *i2c = codec->control_data;
-        u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3;
+        u16 iface = snd_soc_read(codec, SSM2602_IFACE) & 0xfff3;
         int i = get_coeff(ssm2602->sysclk, params_rate(params));
 
         if (substream == ssm2602->slave_substream) {
-                dev_dbg(&i2c->dev, "Ignoring hw_params for slave substream\n");
+                dev_dbg(codec->dev, "Ignoring hw_params for slave substream\n");
                 return 0;
         }
 
@@ -294,8 +245,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream,
         srate = (coeff_div[i].sr << 2) |
                 (coeff_div[i].bosr << 1) | coeff_div[i].usb;
 
-        ssm2602_write(codec, SSM2602_ACTIVE, 0);
-        ssm2602_write(codec, SSM2602_SRATE, srate);
+        snd_soc_write(codec, SSM2602_ACTIVE, 0);
+        snd_soc_write(codec, SSM2602_SRATE, srate);
 
         /* bit size */
         switch (params_format(params)) {
@@ -311,8 +262,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream,
                 iface |= 0x000c;
                 break;
         }
-        ssm2602_write(codec, SSM2602_IFACE, iface);
-        ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);
+        snd_soc_write(codec, SSM2602_IFACE, iface);
+        snd_soc_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);
         return 0;
 }
 
@@ -360,7 +311,7 @@ static int ssm2602_pcm_prepare(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
         /* set active */
-        ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);
+        snd_soc_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);
 
         return 0;
 }
@@ -374,7 +325,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,
 
         /* deactivate */
         if (!codec->active)
-                ssm2602_write(codec, SSM2602_ACTIVE, 0);
+                snd_soc_write(codec, SSM2602_ACTIVE, 0);
 
         if (ssm2602->master_substream == substream)
                 ssm2602->master_substream = ssm2602->slave_substream;
@@ -385,12 +336,12 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,
 static int ssm2602_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
-        u16 mute_reg = ssm2602_read_reg_cache(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE;
+        u16 mute_reg = snd_soc_read(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE;
         if (mute)
-                ssm2602_write(codec, SSM2602_APDIGI,
+                snd_soc_write(codec, SSM2602_APDIGI,
                                 mute_reg | APDIGI_ENABLE_DAC_MUTE);
         else
-                ssm2602_write(codec, SSM2602_APDIGI, mute_reg);
+                snd_soc_write(codec, SSM2602_APDIGI, mute_reg);
         return 0;
 }
 
@@ -466,30 +417,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai,
         }
 
         /* set iface */
-        ssm2602_write(codec, SSM2602_IFACE, iface);
+        snd_soc_write(codec, SSM2602_IFACE, iface);
         return 0;
 }
 
 static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
-        u16 reg = ssm2602_read_reg_cache(codec, SSM2602_PWR) & 0xff7f;
+        u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
                 /* vref/mid, osc on, dac unmute */
-                ssm2602_write(codec, SSM2602_PWR, reg);
+                snd_soc_write(codec, SSM2602_PWR, reg);
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
                 /* everything off except vref/vmid, */
-                ssm2602_write(codec, SSM2602_PWR, reg | PWR_CLK_OUT_PDN);
+                snd_soc_write(codec, SSM2602_PWR, reg | PWR_CLK_OUT_PDN);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* everything off, dac mute, inactive */
-                ssm2602_write(codec, SSM2602_ACTIVE, 0);
-                ssm2602_write(codec, SSM2602_PWR, 0xffff);
+                snd_soc_write(codec, SSM2602_ACTIVE, 0);
+                snd_soc_write(codec, SSM2602_PWR, 0xffff);
                 break;
 
         }
@@ -539,17 +490,10 @@ static int ssm2602_suspend(struct snd_soc_codec *codec, pm_message_t state)
 
 static int ssm2602_resume(struct snd_soc_codec *codec)
 {
-        int i;
-        u8 data[2];
-        u16 *cache = codec->reg_cache;
-
-        /* Sync reg_cache with the hardware */
-        for (i = 0; i < ARRAY_SIZE(ssm2602_reg); i++) {
-                data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
-                data[1] = cache[i] & 0x00ff;
-                codec->hw_write(codec->control_data, data, 2);
-        }
+        snd_soc_cache_sync(codec);
+
         ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
         return 0;
 }
 
@@ -560,31 +504,39 @@ static int ssm2602_probe(struct snd_soc_codec *codec)
 
         pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);
 
-        codec->control_data = ssm2602->control_data;
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, ssm2602->control_type);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
+                return ret;
+        }
 
-        ssm2602_reset(codec);
+        ret = ssm2602_reset(codec);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to issue reset: %d\n", ret);
+                return ret;
+        }
 
         /*power on device*/
-        ssm2602_write(codec, SSM2602_ACTIVE, 0);
+        snd_soc_write(codec, SSM2602_ACTIVE, 0);
         /* set the update bits */
-        reg = ssm2602_read_reg_cache(codec, SSM2602_LINVOL);
-        ssm2602_write(codec, SSM2602_LINVOL, reg | LINVOL_LRIN_BOTH);
-        reg = ssm2602_read_reg_cache(codec, SSM2602_RINVOL);
-        ssm2602_write(codec, SSM2602_RINVOL, reg | RINVOL_RLIN_BOTH);
-        reg = ssm2602_read_reg_cache(codec, SSM2602_LOUT1V);
-        ssm2602_write(codec, SSM2602_LOUT1V, reg | LOUT1V_LRHP_BOTH);
-        reg = ssm2602_read_reg_cache(codec, SSM2602_ROUT1V);
-        ssm2602_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH);
+        reg = snd_soc_read(codec, SSM2602_LINVOL);
+        snd_soc_write(codec, SSM2602_LINVOL, reg | LINVOL_LRIN_BOTH);
+        reg = snd_soc_read(codec, SSM2602_RINVOL);
+        snd_soc_write(codec, SSM2602_RINVOL, reg | RINVOL_RLIN_BOTH);
+        reg = snd_soc_read(codec, SSM2602_LOUT1V);
+        snd_soc_write(codec, SSM2602_LOUT1V, reg | LOUT1V_LRHP_BOTH);
+        reg = snd_soc_read(codec, SSM2602_ROUT1V);
+        snd_soc_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH);
         /*select Line in as default input*/
-        ssm2602_write(codec, SSM2602_APANA, APANA_SELECT_DAC |
+        snd_soc_write(codec, SSM2602_APANA, APANA_SELECT_DAC |
                         APANA_ENABLE_MIC_BOOST);
-        ssm2602_write(codec, SSM2602_PWR, 0);
+        snd_soc_write(codec, SSM2602_PWR, 0);
 
         snd_soc_add_controls(codec, ssm2602_snd_controls,
                                 ARRAY_SIZE(ssm2602_snd_controls));
         ssm2602_add_widgets(codec);
 
-        return ret;
+        return 0;
 }
 
 /* remove everything here */
@@ -599,14 +551,49 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = {
         .remove =       ssm2602_remove,
         .suspend =      ssm2602_suspend,
         .resume =       ssm2602_resume,
-        .read = ssm2602_read_reg_cache,
-        .write = ssm2602_write,
         .set_bias_level = ssm2602_set_bias_level,
         .reg_cache_size = sizeof(ssm2602_reg),
         .reg_word_size = sizeof(u16),
         .reg_cache_default = ssm2602_reg,
 };
 
+#if defined(CONFIG_SPI_MASTER)
+static int __devinit ssm2602_spi_probe(struct spi_device *spi)
+{
+        struct ssm2602_priv *ssm2602;
+        int ret;
+
+        ssm2602 = kzalloc(sizeof(struct ssm2602_priv), GFP_KERNEL);
+        if (ssm2602 == NULL)
+                return -ENOMEM;
+
+        spi_set_drvdata(spi, ssm2602);
+        ssm2602->control_type = SND_SOC_SPI;
+
+        ret = snd_soc_register_codec(&spi->dev,
+                        &soc_codec_dev_ssm2602, &ssm2602_dai, 1);
+        if (ret < 0)
+                kfree(ssm2602);
+        return ret;
+}
+
+static int __devexit ssm2602_spi_remove(struct spi_device *spi)
+{
+        snd_soc_unregister_codec(&spi->dev);
+        kfree(spi_get_drvdata(spi));
+        return 0;
+}
+
+static struct spi_driver ssm2602_spi_driver = {
+        .driver = {
+                .name   = "ssm2602",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ssm2602_spi_probe,
+        .remove         = __devexit_p(ssm2602_spi_remove),
+};
+#endif
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 /*
  * ssm2602 2 wire address is determined by GPIO5
@@ -625,7 +612,6 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c,
                 return -ENOMEM;
 
         i2c_set_clientdata(i2c, ssm2602);
-        ssm2602->control_data = i2c;
         ssm2602->control_type = SND_SOC_I2C;
 
         ret = snd_soc_register_codec(&i2c->dev,
@@ -651,7 +637,7 @@ MODULE_DEVICE_TABLE(i2c, ssm2602_i2c_id);
 /* corgi i2c codec control layer */
 static struct i2c_driver ssm2602_i2c_driver = {
         .driver = {
-                .name = "ssm2602-codec",
+                .name = "ssm2602",
                 .owner = THIS_MODULE,
         },
         .probe = ssm2602_i2c_probe,
@@ -664,19 +650,29 @@ static struct i2c_driver ssm2602_i2c_driver = {
 static int __init ssm2602_modinit(void)
 {
         int ret = 0;
+
+#if defined(CONFIG_SPI_MASTER)
+        ret = spi_register_driver(&ssm2602_spi_driver);
+        if (ret)
+                return ret;
+#endif
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         ret = i2c_add_driver(&ssm2602_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register SSM2602 I2C driver: %d\n",
-                       ret);
-        }
+        if (ret)
+                return ret;
 #endif
+
         return ret;
 }
 module_init(ssm2602_modinit);
 
 static void __exit ssm2602_exit(void)
 {
+#if defined(CONFIG_SPI_MASTER)
+        spi_unregister_driver(&ssm2602_spi_driver);
+#endif
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&ssm2602_i2c_driver);
 #endif