ASoC: Factor out snd_soc_init_card()

[linux-beck.git] / sound / soc / codecs / wm8711.c

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index c7b1af89297b8e69f26f593193947cdbb60e28e0..70e0675b5d4a073bda3f10621400d40376bfc0af 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -19,11 +19,13 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/spi/spi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
+#include <sound/tlv.h>
 #include <sound/initval.h>
 
 #include "wm8711.h"
@@ -50,31 +52,17 @@ static const u16 wm8711_reg[WM8711_CACHEREGNUM] = {
 
 #define wm8711_reset(c)        snd_soc_write(c, WM8711_RESET, 0)
 
+static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
+
 static const struct snd_kcontrol_new wm8711_snd_controls[] = {
 
-SOC_DOUBLE_R("Master Playback Volume", WM8711_LOUT1V, WM8711_ROUT1V,
-       0, 127, 0),
+SOC_DOUBLE_R_TLV("Master Playback Volume", WM8711_LOUT1V, WM8711_ROUT1V,
+                0, 127, 0, out_tlv),
 SOC_DOUBLE_R("Master Playback ZC Switch", WM8711_LOUT1V, WM8711_ROUT1V,
        7, 1, 0),
 
 };
 
-/* add non dapm controls */
-static int wm8711_add_controls(struct snd_soc_codec *codec)
-{
-       int err, i;
-
-       for (i = 0; i < ARRAY_SIZE(wm8711_snd_controls); i++) {
-               err = snd_ctl_add(codec->card,
-                               snd_soc_cnew(&wm8711_snd_controls[i], codec,
-                                       NULL));
-               if (err < 0)
-                       return err;
-       }
-
-       return 0;
-}
-
 /* Output Mixer */
 static const struct snd_kcontrol_new wm8711_output_mixer_controls[] = {
 SOC_DAPM_SINGLE("Line Bypass Switch", WM8711_APANA, 3, 1, 0),
@@ -336,11 +324,7 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-#define WM8711_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
-               SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
-               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
-               SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\
-               SNDRV_PCM_RATE_96000)
+#define WM8711_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8711_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
        SNDRV_PCM_FMTBIT_S24_LE)
@@ -361,7 +345,8 @@ struct snd_soc_dai wm8711_dai = {
                .channels_min = 1,
                .channels_max = 2,
                .rates = WM8711_RATES,
-               .formats = WM8711_FORMATS,},
+               .formats = WM8711_FORMATS,
+       },
        .ops = &wm8711_ops,
 };
 EXPORT_SYMBOL_GPL(wm8711_dai);
@@ -419,17 +404,9 @@ static int wm8711_probe(struct platform_device *pdev)
        snd_soc_add_controls(codec, wm8711_snd_controls,
                             ARRAY_SIZE(wm8711_snd_controls));
        wm8711_add_widgets(codec);
-       ret = snd_soc_init_card(socdev);
-       if (ret < 0) {
-               dev_err(codec->dev, "failed to register card: %d\n", ret);
-               goto card_err;
-       }
 
        return ret;
 
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }
@@ -535,6 +512,45 @@ static void wm8711_unregister(struct wm8711_priv *wm8711)
        wm8711_codec = NULL;
 }
 
+#if defined(CONFIG_SPI_MASTER)
+static int __devinit wm8711_spi_probe(struct spi_device *spi)
+{
+       struct snd_soc_codec *codec;
+       struct wm8711_priv *wm8711;
+
+       wm8711 = kzalloc(sizeof(struct wm8711_priv), GFP_KERNEL);
+       if (wm8711 == NULL)
+               return -ENOMEM;
+
+       codec = &wm8711->codec;
+       codec->control_data = spi;
+       codec->dev = &spi->dev;
+
+       dev_set_drvdata(&spi->dev, wm8711);
+
+       return wm8711_register(wm8711, SND_SOC_SPI);
+}
+
+static int __devexit wm8711_spi_remove(struct spi_device *spi)
+{
+       struct wm8711_priv *wm8711 = dev_get_drvdata(&spi->dev);
+
+       wm8711_unregister(wm8711);
+
+       return 0;
+}
+
+static struct spi_driver wm8711_spi_driver = {
+       .driver = {
+               .name   = "wm8711",
+               .bus    = &spi_bus_type,
+               .owner  = THIS_MODULE,
+       },
+       .probe          = wm8711_spi_probe,
+       .remove         = __devexit_p(wm8711_spi_remove),
+};
+#endif /* CONFIG_SPI_MASTER */
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8711_i2c_probe(struct i2c_client *i2c,
                                      const struct i2c_device_id *id)
@@ -590,6 +606,13 @@ static int __init wm8711_modinit(void)
                printk(KERN_ERR "Failed to register WM8711 I2C driver: %d\n",
                       ret);
        }
+#endif
+#if defined(CONFIG_SPI_MASTER)
+       ret = spi_register_driver(&wm8711_spi_driver);
+       if (ret != 0) {
+               printk(KERN_ERR "Failed to register WM8711 SPI driver: %d\n",
+                      ret);
+       }
 #endif
        return 0;
 }
@@ -600,6 +623,9 @@ static void __exit wm8711_exit(void)
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        i2c_del_driver(&wm8711_i2c_driver);
 #endif
+#if defined(CONFIG_SPI_MASTER)
+       spi_unregister_driver(&wm8711_spi_driver);
+#endif
 }
 module_exit(wm8711_exit);