4 files changed, 573 insertions, 1 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 98175a096df2..f745e557831e 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -17,6 +17,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_AD193X if SND_SOC_I2C_AND_SPI
         select SND_SOC_AD1980 if SND_SOC_AC97_BUS
         select SND_SOC_AD73311
+        select SND_SOC_ADAU1701 if I2C
         select SND_SOC_ADS117X
         select SND_SOC_AK4104 if SPI_MASTER
         select SND_SOC_AK4535 if I2C
@@ -130,7 +131,11 @@ config SND_SOC_AD1980
 
 config SND_SOC_AD73311
         tristate
-        
+
+config SND_SOC_ADAU1701
+        select SIGMA
+        tristate
+
 config SND_SOC_ADS117X
         tristate
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index fd8558406ef0..30a4c631aef4 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -4,6 +4,7 @@ snd-soc-ad1836-objs := ad1836.o
 snd-soc-ad193x-objs := ad193x.o
 snd-soc-ad1980-objs := ad1980.o
 snd-soc-ad73311-objs := ad73311.o
+snd-soc-adau1701-objs := adau1701.o
 snd-soc-ads117x-objs := ads117x.o
 snd-soc-ak4104-objs := ak4104.o
 snd-soc-ak4535-objs := ak4535.o
@@ -95,6 +96,7 @@ obj-$(CONFIG_SND_SOC_AD1836)	+= snd-soc-ad1836.o
 obj-$(CONFIG_SND_SOC_AD193X)    += snd-soc-ad193x.o
 obj-$(CONFIG_SND_SOC_AD1980)    += snd-soc-ad1980.o
 obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
+obj-$(CONFIG_SND_SOC_ADAU1701)  += snd-soc-adau1701.o
 obj-$(CONFIG_SND_SOC_ADS117X)   += snd-soc-ads117x.o
 obj-$(CONFIG_SND_SOC_AK4104)    += snd-soc-ak4104.o
 obj-$(CONFIG_SND_SOC_AK4535)    += snd-soc-ak4535.o
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
new file mode 100644
index 000000000000..6c01bb649123
--- /dev/null
+++ b/sound/soc/codecs/adau1701.c
@@ -0,0 +1,548 @@
+/*
+ * Driver for ADAU1701 SigmaDSP processor
+ *
+ * Copyright 2011 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *      based on an inital version by Cliff Cai <cliff.cai@analog.com>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/sigma.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include "adau1701.h"
+
+#define ADAU1701_DSPCTRL        0x1c
+#define ADAU1701_SEROCTL        0x1e
+#define ADAU1701_SERICTL        0x1f
+
+#define ADAU1701_AUXNPOW        0x22
+
+#define ADAU1701_OSCIPOW        0x26
+#define ADAU1701_DACSET         0x27
+
+#define ADAU1701_NUM_REGS       0x28
+
+#define ADAU1701_DSPCTRL_CR             (1 << 2)
+#define ADAU1701_DSPCTRL_DAM            (1 << 3)
+#define ADAU1701_DSPCTRL_ADM            (1 << 4)
+#define ADAU1701_DSPCTRL_SR_48          0x00
+#define ADAU1701_DSPCTRL_SR_96          0x01
+#define ADAU1701_DSPCTRL_SR_192         0x02
+#define ADAU1701_DSPCTRL_SR_MASK        0x03
+
+#define ADAU1701_SEROCTL_INV_LRCLK      0x2000
+#define ADAU1701_SEROCTL_INV_BCLK       0x1000
+#define ADAU1701_SEROCTL_MASTER         0x0800
+
+#define ADAU1701_SEROCTL_OBF16          0x0000
+#define ADAU1701_SEROCTL_OBF8           0x0200
+#define ADAU1701_SEROCTL_OBF4           0x0400
+#define ADAU1701_SEROCTL_OBF2           0x0600
+#define ADAU1701_SEROCTL_OBF_MASK       0x0600
+
+#define ADAU1701_SEROCTL_OLF1024        0x0000
+#define ADAU1701_SEROCTL_OLF512         0x0080
+#define ADAU1701_SEROCTL_OLF256         0x0100
+#define ADAU1701_SEROCTL_OLF_MASK       0x0180
+
+#define ADAU1701_SEROCTL_MSB_DEALY1     0x0000
+#define ADAU1701_SEROCTL_MSB_DEALY0     0x0004
+#define ADAU1701_SEROCTL_MSB_DEALY8     0x0008
+#define ADAU1701_SEROCTL_MSB_DEALY12    0x000c
+#define ADAU1701_SEROCTL_MSB_DEALY16    0x0010
+#define ADAU1701_SEROCTL_MSB_DEALY_MASK 0x001c
+
+#define ADAU1701_SEROCTL_WORD_LEN_24    0x0000
+#define ADAU1701_SEROCTL_WORD_LEN_20    0x0001
+#define ADAU1701_SEROCTL_WORD_LEN_16    0x0010
+#define ADAU1701_SEROCTL_WORD_LEN_MASK  0x0003
+
+#define ADAU1701_AUXNPOW_VBPD           0x40
+#define ADAU1701_AUXNPOW_VRPD           0x20
+
+#define ADAU1701_SERICTL_I2S            0
+#define ADAU1701_SERICTL_LEFTJ          1
+#define ADAU1701_SERICTL_TDM            2
+#define ADAU1701_SERICTL_RIGHTJ_24      3
+#define ADAU1701_SERICTL_RIGHTJ_20      4
+#define ADAU1701_SERICTL_RIGHTJ_18      5
+#define ADAU1701_SERICTL_RIGHTJ_16      6
+#define ADAU1701_SERICTL_MODE_MASK      7
+#define ADAU1701_SERICTL_INV_BCLK       BIT(3)
+#define ADAU1701_SERICTL_INV_LRCLK      BIT(4)
+
+#define ADAU1701_OSCIPOW_OPD            0x04
+#define ADAU1701_DACSET_DACINIT         1
+
+#define ADAU1701_FIRMWARE "adau1701.bin"
+
+struct adau1701 {
+        unsigned int dai_fmt;
+};
+
+static const struct snd_kcontrol_new adau1701_controls[] = {
+        SOC_SINGLE("Master Capture Switch", ADAU1701_DSPCTRL, 4, 1, 0),
+};
+
+static const struct snd_soc_dapm_widget adau1701_dapm_widgets[] = {
+        SND_SOC_DAPM_DAC("DAC0", "Playback", ADAU1701_AUXNPOW, 3, 1),
+        SND_SOC_DAPM_DAC("DAC1", "Playback", ADAU1701_AUXNPOW, 2, 1),
+        SND_SOC_DAPM_DAC("DAC2", "Playback", ADAU1701_AUXNPOW, 1, 1),
+        SND_SOC_DAPM_DAC("DAC3", "Playback", ADAU1701_AUXNPOW, 0, 1),
+        SND_SOC_DAPM_ADC("ADC", "Capture", ADAU1701_AUXNPOW, 7, 1),
+
+        SND_SOC_DAPM_OUTPUT("OUT0"),
+        SND_SOC_DAPM_OUTPUT("OUT1"),
+        SND_SOC_DAPM_OUTPUT("OUT2"),
+        SND_SOC_DAPM_OUTPUT("OUT3"),
+        SND_SOC_DAPM_INPUT("IN0"),
+        SND_SOC_DAPM_INPUT("IN1"),
+};
+
+static const struct snd_soc_dapm_route adau1701_dapm_routes[] = {
+        { "OUT0", NULL, "DAC0" },
+        { "OUT1", NULL, "DAC1" },
+        { "OUT2", NULL, "DAC2" },
+        { "OUT3", NULL, "DAC3" },
+
+        { "ADC", NULL, "IN0" },
+        { "ADC", NULL, "IN1" },
+};
+
+static unsigned int adau1701_register_size(struct snd_soc_codec *codec,
+                unsigned int reg)
+{
+        switch (reg) {
+        case ADAU1701_DSPCTRL:
+        case ADAU1701_SEROCTL:
+        case ADAU1701_AUXNPOW:
+        case ADAU1701_OSCIPOW:
+        case ADAU1701_DACSET:
+                return 2;
+        case ADAU1701_SERICTL:
+                return 1;
+        }
+
+        dev_err(codec->dev, "Unsupported register address: %d\n", reg);
+        return 0;
+}
+
+static int adau1701_write(struct snd_soc_codec *codec, unsigned int reg,
+                unsigned int value)
+{
+        unsigned int i, ret;
+        unsigned int size;
+        uint8_t buf[4];
+
+        size = adau1701_register_size(codec, reg);
+        if (size == 0)
+                return -EINVAL;
+
+        snd_soc_cache_write(codec, reg, value);
+
+        buf[0] = 0x08;
+        buf[1] = reg;
+
+        for (i = size + 1; i >= 2; --i) {
+                buf[i] = value;
+                value >>= 8;
+        }
+
+        ret = i2c_master_send(to_i2c_client(codec->dev), buf, size + 2);
+        if (ret == size + 2)
+                return 0;
+        else if (ret < 0)
+                return ret;
+        else
+                return -EIO;
+}
+
+static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg)
+{
+        unsigned int value;
+        unsigned int ret;
+
+        ret = snd_soc_cache_read(codec, reg, &value);
+        if (ret)
+                return ret;
+
+        return value;
+}
+
+static int adau1701_load_firmware(struct snd_soc_codec *codec)
+{
+        return process_sigma_firmware(codec->control_data, ADAU1701_FIRMWARE);
+}
+
+static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,
+                snd_pcm_format_t format)
+{
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
+        unsigned int mask = ADAU1701_SEROCTL_WORD_LEN_MASK;
+        unsigned int val;
+
+        switch (format) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                val = ADAU1701_SEROCTL_WORD_LEN_16;
+                break;
+        case SNDRV_PCM_FORMAT_S20_3LE:
+                val = ADAU1701_SEROCTL_WORD_LEN_20;
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                val = ADAU1701_SEROCTL_WORD_LEN_24;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (adau1701->dai_fmt == SND_SOC_DAIFMT_RIGHT_J) {
+                switch (format) {
+                case SNDRV_PCM_FORMAT_S16_LE:
+                        val |= ADAU1701_SEROCTL_MSB_DEALY16;
+                        break;
+                case SNDRV_PCM_FORMAT_S20_3LE:
+                        val |= ADAU1701_SEROCTL_MSB_DEALY12;
+                        break;
+                case SNDRV_PCM_FORMAT_S24_LE:
+                        val |= ADAU1701_SEROCTL_MSB_DEALY8;
+                        break;
+                }
+                mask |= ADAU1701_SEROCTL_MSB_DEALY_MASK;
+        }
+
+        snd_soc_update_bits(codec, ADAU1701_SEROCTL, mask, val);
+
+        return 0;
+}
+
+static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec,
+                        snd_pcm_format_t format)
+{
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val;
+
+        if (adau1701->dai_fmt != SND_SOC_DAIFMT_RIGHT_J)
+                return 0;
+
+        switch (format) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                val = ADAU1701_SERICTL_RIGHTJ_16;
+                break;
+        case SNDRV_PCM_FORMAT_S20_3LE:
+                val = ADAU1701_SERICTL_RIGHTJ_20;
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                val = ADAU1701_SERICTL_RIGHTJ_24;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec, ADAU1701_SERICTL,
+                ADAU1701_SERICTL_MODE_MASK, val);
+
+        return 0;
+}
+
+static int adau1701_hw_params(struct snd_pcm_substream *substream,
+                struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_codec *codec = rtd->codec;
+        snd_pcm_format_t format;
+        unsigned int val;
+
+        switch (params_rate(params)) {
+        case 192000:
+                val = ADAU1701_DSPCTRL_SR_192;
+                break;
+        case 96000:
+                val = ADAU1701_DSPCTRL_SR_96;
+                break;
+        case 48000:
+                val = ADAU1701_DSPCTRL_SR_48;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec, ADAU1701_DSPCTRL,
+                ADAU1701_DSPCTRL_SR_MASK, val);
+
+        format = params_format(params);
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                return adau1701_set_playback_pcm_format(codec, format);
+        else
+                return adau1701_set_capture_pcm_format(codec, format);
+}
+
+static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai,
+                unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
+        unsigned int serictl = 0x00, seroctl = 0x00;
+        bool invert_lrclk;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                /* master, 64-bits per sample, 1 frame per sample */
+                seroctl |= ADAU1701_SEROCTL_MASTER | ADAU1701_SEROCTL_OBF16
+                                | ADAU1701_SEROCTL_OLF1024;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* clock inversion */
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                invert_lrclk = false;
+                break;
+        case SND_SOC_DAIFMT_NB_IF:
+                invert_lrclk = true;
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                invert_lrclk = false;
+                serictl |= ADAU1701_SERICTL_INV_BCLK;
+                seroctl |= ADAU1701_SEROCTL_INV_BCLK;
+                break;
+        case SND_SOC_DAIFMT_IB_IF:
+                invert_lrclk = true;
+                serictl |= ADAU1701_SERICTL_INV_BCLK;
+                seroctl |= ADAU1701_SEROCTL_INV_BCLK;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                serictl |= ADAU1701_SERICTL_LEFTJ;
+                seroctl |= ADAU1701_SEROCTL_MSB_DEALY0;
+                invert_lrclk = !invert_lrclk;
+                break;
+        case SND_SOC_DAIFMT_RIGHT_J:
+                serictl |= ADAU1701_SERICTL_RIGHTJ_24;
+                seroctl |= ADAU1701_SEROCTL_MSB_DEALY8;
+                invert_lrclk = !invert_lrclk;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (invert_lrclk) {
+                seroctl |= ADAU1701_SEROCTL_INV_LRCLK;
+                serictl |= ADAU1701_SERICTL_INV_LRCLK;
+        }
+
+        adau1701->dai_fmt = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
+
+        snd_soc_write(codec, ADAU1701_SERICTL, serictl);
+        snd_soc_update_bits(codec, ADAU1701_SEROCTL,
+                ~ADAU1701_SEROCTL_WORD_LEN_MASK, seroctl);
+
+        return 0;
+}
+
+static int adau1701_set_bias_level(struct snd_soc_codec *codec,
+                enum snd_soc_bias_level level)
+{
+        unsigned int mask = ADAU1701_AUXNPOW_VBPD | ADAU1701_AUXNPOW_VRPD;
+
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                /* Enable VREF and VREF buffer */
+                snd_soc_update_bits(codec, ADAU1701_AUXNPOW, mask, 0x00);
+                break;
+        case SND_SOC_BIAS_OFF:
+                /* Disable VREF and VREF buffer */
+                snd_soc_update_bits(codec, ADAU1701_AUXNPOW, mask, mask);
+                break;
+        }
+
+        codec->dapm.bias_level = level;
+        return 0;
+}
+
+static int adau1701_digital_mute(struct snd_soc_dai *dai, int mute)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        unsigned int mask = ADAU1701_DSPCTRL_DAM;
+        unsigned int val;
+
+        if (mute)
+                val = 0;
+        else
+                val = mask;
+
+        snd_soc_update_bits(codec, ADAU1701_DSPCTRL, mask, val);
+
+        return 0;
+}
+
+static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id,
+        unsigned int freq, int dir)
+{
+        unsigned int val;
+
+        switch (clk_id) {
+        case ADAU1701_CLK_SRC_OSC:
+                val = 0x0;
+                break;
+        case ADAU1701_CLK_SRC_MCLK:
+                val = ADAU1701_OSCIPOW_OPD;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec, ADAU1701_OSCIPOW, ADAU1701_OSCIPOW_OPD, val);
+
+        return 0;
+}
+
+#define ADAU1701_RATES (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | \
+        SNDRV_PCM_RATE_192000)
+
+#define ADAU1701_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
+        SNDRV_PCM_FMTBIT_S24_LE)
+
+static const struct snd_soc_dai_ops adau1701_dai_ops = {
+        .set_fmt        = adau1701_set_dai_fmt,
+        .hw_params      = adau1701_hw_params,
+        .digital_mute   = adau1701_digital_mute,
+};
+
+static struct snd_soc_dai_driver adau1701_dai = {
+        .name = "adau1701",
+        .playback = {
+                .stream_name = "Playback",
+                .channels_min = 2,
+                .channels_max = 8,
+                .rates = ADAU1701_RATES,
+                .formats = ADAU1701_FORMATS,
+        },
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 2,
+                .channels_max = 8,
+                .rates = ADAU1701_RATES,
+                .formats = ADAU1701_FORMATS,
+        },
+        .ops = &adau1701_dai_ops,
+        .symmetric_rates = 1,
+};
+
+static int adau1701_probe(struct snd_soc_codec *codec)
+{
+        int ret;
+
+        codec->dapm.idle_bias_off = 1;
+
+        ret = adau1701_load_firmware(codec);
+        if (ret)
+                dev_warn(codec->dev, "Failed to load firmware\n");
+
+        snd_soc_write(codec, ADAU1701_DACSET, ADAU1701_DACSET_DACINIT);
+        snd_soc_write(codec, ADAU1701_DSPCTRL, ADAU1701_DSPCTRL_CR);
+
+        return 0;
+}
+
+static struct snd_soc_codec_driver adau1701_codec_drv = {
+        .probe                  = adau1701_probe,
+        .set_bias_level         = adau1701_set_bias_level,
+
+        .reg_cache_size         = ADAU1701_NUM_REGS,
+        .reg_word_size          = sizeof(u16),
+
+        .controls               = adau1701_controls,
+        .num_controls           = ARRAY_SIZE(adau1701_controls),
+        .dapm_widgets           = adau1701_dapm_widgets,
+        .num_dapm_widgets       = ARRAY_SIZE(adau1701_dapm_widgets),
+        .dapm_routes            = adau1701_dapm_routes,
+        .num_dapm_routes        = ARRAY_SIZE(adau1701_dapm_routes),
+
+        .write                  = adau1701_write,
+        .read                   = adau1701_read,
+
+        .set_sysclk             = adau1701_set_sysclk,
+};
+
+static __devinit int adau1701_i2c_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct adau1701 *adau1701;
+        int ret;
+
+        adau1701 = kzalloc(sizeof(*adau1701), GFP_KERNEL);
+        if (!adau1701)
+                return -ENOMEM;
+
+        i2c_set_clientdata(client, adau1701);
+        ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv,
+                        &adau1701_dai, 1);
+        if (ret < 0)
+                kfree(adau1701);
+
+        return ret;
+}
+
+static __devexit int adau1701_i2c_remove(struct i2c_client *client)
+{
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
+        return 0;
+}
+
+static const struct i2c_device_id adau1701_i2c_id[] = {
+        { "adau1701", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, adau1701_i2c_id);
+
+static struct i2c_driver adau1701_i2c_driver = {
+        .driver = {
+                .name   = "adau1701",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = adau1701_i2c_probe,
+        .remove         = __devexit_p(adau1701_i2c_remove),
+        .id_table       = adau1701_i2c_id,
+};
+
+static int __init adau1701_init(void)
+{
+        return i2c_add_driver(&adau1701_i2c_driver);
+}
+module_init(adau1701_init);
+
+static void __exit adau1701_exit(void)
+{
+        i2c_del_driver(&adau1701_i2c_driver);
+}
+module_exit(adau1701_exit);
+
+MODULE_DESCRIPTION("ASoC ADAU1701 SigmaDSP driver");
+MODULE_AUTHOR("Cliff Cai <cliff.cai@analog.com>");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1701.h b/sound/soc/codecs/adau1701.h
new file mode 100644
index 000000000000..8d0949a2aec9
--- /dev/null
+++ b/sound/soc/codecs/adau1701.h
@@ -0,0 +1,17 @@
+/*
+ * header file for ADAU1701 SigmaDSP processor
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef _ADAU1701_H
+#define _ADAU1701_H
+
+enum adau1701_clk_src {
+        ADAU1701_CLK_SRC_OSC,
+        ADAU1701_CLK_SRC_MCLK,
+};
+
+#endif