commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=7e576f55c000c4f2c1516c0a6cc74805a0bb70d9 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/2011R1
Signed-off-by: Lars-Peter Clausen <[email protected]> --- sound/soc/codecs/adau1701.c | 666 ++++++++++++++++++++++++------------------- sound/soc/codecs/adau1701.h | 103 +------- 2 files changed, 378 insertions(+), 391 deletions(-) diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 13364d7..2758d5f 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -2,217 +2,307 @@ * Driver for ADAU1701 SigmaDSP processor * * Copyright 2011 Analog Devices Inc. + * Author: Lars-Peter Clausen <[email protected]> + * based on an inital version by Cliff Cai <[email protected]> * * Licensed under the GPL-2 or later. */ #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/init.h> -#include <linux/delay.h> -#include <linux/pm.h> #include <linux/i2c.h> -#include <linux/workqueue.h> -#include <linux/platform_device.h> +#include <linux/delay.h> #include <linux/sigma.h> -#include <linux/sysfs.h> #include <linux/slab.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/initval.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" -#define USE_OSCILLATOR 1 -/* codec private data */ -struct adau1701_priv { - struct snd_soc_codec *codec; - enum snd_soc_control_type control_type; -}; -struct register_lut { - u16 address; - int length; +struct adau1701 { + unsigned int dai_fmt; }; -static const struct register_lut register_table[] = { - - {ADAU1701_IFACE0, 4}, - {ADAU1701_IFACE1, 4}, - {ADAU1701_IFACE2, 4}, - {ADAU1701_IFACE3, 4}, - {ADAU1701_IFACE4, 4}, - {ADAU1701_IFACE5, 4}, - {ADAU1701_IFACE6, 4}, - {ADAU1701_IFACE7, 4}, - - {ADAU1701_GPIOSET, 2}, - - {ADAU1701_AUXADC0, 2}, - {ADAU1701_AUXADC1, 2}, - {ADAU1701_AUXADC2, 2}, - {ADAU1701_AUXADC3, 2}, - - {ADAU1701_DATCAP0, 2}, - {ADAU1701_DATCAP1, 2}, - - {ADAU1701_DSPCTRL, 2}, - {ADAU1701_DSPRES, 1}, - {ADAU1701_SEROCTL, 1}, - {ADAU1701_SERITL1, 1}, +static const struct snd_kcontrol_new adau1701_controls[] = { + SOC_SINGLE("Master Capture Switch", ADAU1701_DSPCTRL, 4, 1, 0), +}; - {ADAU1701_MPCONF0, 3}, - {ADAU1701_MPCONF1, 3}, +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"), +}; - {ADAU1701_AUXNPOW, 2}, - {ADAU1701_AUXADCE, 2}, +static const struct snd_soc_dapm_route adau1701_dapm_routes[] = { + { "OUT0", NULL, "DAC0" }, + { "OUT1", NULL, "DAC1" }, + { "OUT2", NULL, "DAC2" }, + { "OUT3", NULL, "DAC3" }, - {ADAU1701_OSCIPOW, 2}, - {ADAU1701_DACSET, 2}, + { "ADC", NULL, "IN0" }, + { "ADC", NULL, "IN1" }, }; -/* - * Write a ADAU1701 register,since the register length is from 1 to 5, - * So, use our own read/write functions instead of snd_soc_read/write. - */ -static int adau1701_write_register(struct snd_soc_codec *codec, - u16 reg_address, u32 value) -{ - int i; - int length, count; - u8 buf[8]; - for (i = 0; i < ARRAY_SIZE(register_table); i++) { - if (register_table[i].address == reg_address) - break; - } - if (i == ARRAY_SIZE(register_table)) { - dev_err(codec->dev, "Wrong Register Address\n"); - return -EINVAL; - } - length = register_table[i].length; - count = length + 2; /* data plus 16bit register address */ - - buf[0] = reg_address >> 8; - buf[1] = reg_address; - if (length == 1) - buf[2] = value; - else if (length == 2) { - buf[2] = value >> 8; - buf[3] = value; - } else if (length == 3) { - buf[2] = value >> 16; - buf[3] = value >> 8; - buf[4] = value; - } else if (length == 4) { - buf[2] = value >> 24; - buf[3] = value >> 16; - buf[4] = value >> 8; - buf[5] = value; +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; } - return i2c_master_send(codec->control_data, buf, count); + + dev_err(codec->dev, "Unsupported register address: %d\n", reg); + return 0; } -/* - * read ADAU1701 hw register - */ -static u32 adau1701_read_register(struct snd_soc_codec *codec, - u16 reg_address) +static int adau1701_write(struct snd_soc_codec *codec, unsigned int reg, + unsigned int value) { - u8 addr[2]; - u8 buf[3]; - int ret, i, length; - u32 value = 0; + unsigned int i; + unsigned int size; + uint8_t buf[4]; + int ret; - for (i = 0; i < ARRAY_SIZE(register_table); i++) { - if (register_table[i].address == reg_address) - break; - } - if (i == ARRAY_SIZE(register_table)) { - dev_err(codec->dev, "Wrong Register Address\n"); + size = adau1701_register_size(codec, reg); + if (size == 0) return -EINVAL; - } - length = register_table[i].length; - if (reg_address < ADAU1701_FIRSTREG) - reg_address = reg_address + ADAU1701_FIRSTREG; + snd_soc_cache_write(codec, reg, value); - if ((reg_address < ADAU1701_FIRSTREG) || (reg_address > ADAU1701_LASTREG)) + 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; +} - addr[0] = reg_address >> 8; - addr[1] = reg_address; +static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg) +{ + unsigned int value; + unsigned int ret; - /* write the 2byte read address */ - ret = i2c_master_send(codec->control_data, addr, 2); + ret = snd_soc_cache_read(codec, reg, &value); if (ret) return ret; - if (length == 1) { - if (i2c_master_recv(codec->control_data, buf, 1) != 1) - return -EIO; - value = buf[0]; - } else if (length == 2) { - if (i2c_master_recv(codec->control_data, buf, 2) != 2) - return -EIO; - value = (buf[0] << 8) | buf[1]; - } else if (length == 3) { - if (i2c_master_recv(codec->control_data, buf, 3) != 3) - return -EIO; - value = (buf[0] << 16) | (buf[1] << 8) | buf[2]; - } return value; } -static int adau1701_setprogram(struct snd_soc_codec *codec) +static int adau1701_load_firmware(struct snd_soc_codec *codec) { - int ret; + return process_sigma_firmware(codec->control_data, ADAU1701_FIRMWARE); +} - ret = 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; - return ret; + 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_pcm_prepare(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) +static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec, + snd_pcm_format_t format) { - struct snd_soc_codec *codec = dai->codec; - u16 reg; + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + unsigned int val; - reg = ADAU1701_SEROCTL_MASTER | ADAU1701_SEROCTL_OBF16 | - ADAU1701_SEROCTL_OLF1024; - adau1701_write_register(codec, ADAU1701_SEROCTL, reg); + 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 void adau1701_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) +static int adau1701_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; + 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; + } - adau1701_write_register(codec, ADAU1701_SEROCTL, 0); + 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; - u8 reg; - - reg = adau1701_read_register(codec, ADAU1701_SERITL1); - /* interface format */ - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { - case SND_SOC_DAIFMT_I2S: - reg &= ~ADAU1701_SERITL1_MSK; + 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_LEFT_J: - reg |= ADAU1701_SERITL1_LEFTJ; + case SND_SOC_DAIFMT_CBS_CFS: break; - /* TODO: support TDM */ default: return -EINVAL; } @@ -220,58 +310,127 @@ static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai, /* 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; - /* TODO: support signal inversions */ default: return -EINVAL; } - /* set iface format */ - adau1701_write_register(codec, ADAU1701_SERITL1, reg); + 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) + enum snd_soc_bias_level level) { - u16 reg; + unsigned int mask = ADAU1701_AUXNPOW_VBPD | ADAU1701_AUXNPOW_VRPD; + switch (level) { case SND_SOC_BIAS_ON: - reg = adau1701_read_register(codec, ADAU1701_AUXNPOW); - reg &= ~(ADAU1701_AUXNPOW_AAPD | ADAU1701_AUXNPOW_D0PD | - ADAU1701_AUXNPOW_D1PD | ADAU1701_AUXNPOW_D2PD | - ADAU1701_AUXNPOW_D3PD | ADAU1701_AUXNPOW_VBPD | - ADAU1701_AUXNPOW_VRPD); - adau1701_write_register(codec, ADAU1701_AUXNPOW, reg); 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: - /* everything off, dac mute, inactive */ - reg = adau1701_read_register(codec, ADAU1701_AUXNPOW); - reg |= ADAU1701_AUXNPOW_AAPD | ADAU1701_AUXNPOW_D0PD | - ADAU1701_AUXNPOW_D1PD | ADAU1701_AUXNPOW_D2PD | - ADAU1701_AUXNPOW_D3PD | ADAU1701_AUXNPOW_VBPD | - ADAU1701_AUXNPOW_VRPD; - adau1701_write_register(codec, ADAU1701_AUXNPOW, reg); + /* Disable VREF and VREF buffer */ + snd_soc_update_bits(codec, ADAU1701_AUXNPOW, mask, mask); break; - } + codec->dapm.bias_level = level; return 0; } -#define ADAU1701_RATES SNDRV_PCM_RATE_48000 +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 struct snd_soc_dai_ops adau1701_dai_ops = { - .prepare = adau1701_pcm_prepare, - .shutdown = adau1701_shutdown, +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 = { @@ -279,140 +438,70 @@ static struct snd_soc_dai_driver adau1701_dai = { .playback = { .stream_name = "Playback", .channels_min = 2, - .channels_max = 2, + .channels_max = 8, .rates = ADAU1701_RATES, .formats = ADAU1701_FORMATS, }, .capture = { .stream_name = "Capture", .channels_min = 2, - .channels_max = 2, + .channels_max = 8, .rates = ADAU1701_RATES, .formats = ADAU1701_FORMATS, }, .ops = &adau1701_dai_ops, + .symmetric_rates = 1, }; -static int adau1701_suspend(struct snd_soc_codec *codec, pm_message_t state) +static int adau1701_probe(struct snd_soc_codec *codec) { - adau1701_set_bias_level(codec, SND_SOC_BIAS_OFF); - return 0; -} + int ret; -static int adau1701_resume(struct snd_soc_codec *codec) -{ - adau1701_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - return 0; -} + codec->dapm.idle_bias_off = 1; -static ssize_t adau1371_dsp_load(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - int ret; - u32 reg; - struct adau1701_priv *adau1701 = dev_get_drvdata(dev); - struct snd_soc_codec *codec = adau1701->codec; - - reg = ADAU1701_DSPCTRL_DAM | ADAU1701_DSPCTRL_ADM; - adau1701_write_register(codec, ADAU1701_DSPCTRL, reg); - ret = adau1701_setprogram(codec); - reg = ADAU1701_DSPCTRL_DAM | ADAU1701_DSPCTRL_ADM; - adau1701_write_register(codec, ADAU1701_DSPCTRL, reg); + ret = adau1701_load_firmware(codec); if (ret) - return ret; - else - return count; -} -static DEVICE_ATTR(dsp, 0644, NULL, adau1371_dsp_load); + dev_warn(codec->dev, "Failed to load firmware\n"); -static int adau1701_reg_init(struct snd_soc_codec *codec) -{ - u32 reg; - int ret; + snd_soc_write(codec, ADAU1701_DACSET, ADAU1701_DACSET_DACINIT); + snd_soc_write(codec, ADAU1701_DSPCTRL, ADAU1701_DSPCTRL_CR); - /* Load default program */ - ret = adau1701_setprogram(codec); - if (ret < 0) { - dev_err(codec->dev, "Loading program data failed\n"); - goto error; - } - reg = 0x08; - adau1701_write_register(codec, ADAU1701_DSPRES, reg); - adau1701_write_register(codec, ADAU1701_SEROCTL, 0); - adau1701_write_register(codec, ADAU1701_SERITL1, 0); - /* Configure the multipurpose pins as serial in/out pins */ - reg = ADAU1701_MPCONF_SDATAP | ADAU1701_MPCONF_SDATAP << 16 | - ADAU1701_MPCONF_SDATAP << 20; - adau1701_write_register(codec, ADAU1701_MPCONF0, reg); - reg = ADAU1701_MPCONF_AUXADC << 8 | ADAU1701_MPCONF_SDATAP << 12 | - ADAU1701_MPCONF_SDATAP << 16 | ADAU1701_MPCONF_SDATAP << 20; - adau1701_write_register(codec, ADAU1701_MPCONF1, reg); - adau1701_write_register(codec, ADAU1701_AUXNPOW, 0); - reg = ADAU1701_AUXADCE_AAEN; - adau1701_write_register(codec, ADAU1701_AUXADCE, reg); - reg = ADAU1701_DACSET_DACEN; - adau1701_write_register(codec, ADAU1701_DACSET, reg); - reg = ADAU1701_DSPCTRL_DAM | ADAU1701_DSPCTRL_ADM | ADAU1701_DSPCTRL_CR; - adau1701_write_register(codec, ADAU1701_DSPCTRL, reg); -#ifdef USE_OSCILLATOR - /* Power-up the oscillator */ - adau1701_write_register(codec, ADAU1701_OSCIPOW, 0); -#endif -error: - return ret; + return 0; } -static int adau1701_probe(struct snd_soc_codec *codec) -{ - int ret = 0; +static struct snd_soc_codec_driver adau1701_codec_drv = { + .probe = adau1701_probe, + .set_bias_level = adau1701_set_bias_level, - struct adau1701_priv *adau1701 = snd_soc_codec_get_drvdata(codec); - - adau1701->codec = codec; - ret = snd_soc_codec_set_cache_io(codec, 16, 16, adau1701->control_type); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = adau1701_reg_init(codec); - if (ret < 0) { - dev_err(codec->dev, "failed to initialize\n"); - return ret; - } - ret = device_create_file(codec->dev, &dev_attr_dsp); - if (ret) - dev_err(codec->dev, "device_create_file() failed\n"); + .reg_cache_size = ADAU1701_NUM_REGS, + .reg_word_size = sizeof(u16), - return ret; -} + .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), -static int adau1701_remove(struct snd_soc_codec *codec) -{ - return adau1701_set_bias_level(codec, SND_SOC_BIAS_OFF); -} + .write = adau1701_write, + .read = adau1701_read, -struct snd_soc_codec_driver soc_codec_dev_adau1701 = { - .probe = adau1701_probe, - .remove = adau1701_remove, - .suspend = adau1701_suspend, - .resume = adau1701_resume, - .set_bias_level = adau1701_set_bias_level, + .set_sysclk = adau1701_set_sysclk, }; -static __devinit int adau1701_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static __devinit int adau1701_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) { - struct adau1701_priv *adau1701; - int ret = 0; + struct adau1701 *adau1701; + int ret; - adau1701 = kzalloc(sizeof(struct adau1701_priv), GFP_KERNEL); - if (adau1701 == NULL) + adau1701 = kzalloc(sizeof(*adau1701), GFP_KERNEL); + if (!adau1701) return -ENOMEM; - adau1701->control_type = SND_SOC_I2C; - i2c_set_clientdata(i2c, adau1701); - ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_adau1701, &adau1701_dai, 1); + i2c_set_clientdata(client, adau1701); + ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv, + &adau1701_dai, 1); if (ret < 0) kfree(adau1701); @@ -432,29 +521,21 @@ static const struct i2c_device_id adau1701_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, adau1701_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver adau1701_i2c_driver = { .driver = { - .name = "adau1701", - .owner = THIS_MODULE, + .name = "adau1701", + .owner = THIS_MODULE, }, - .probe = adau1701_i2c_probe, - .remove = __devexit_p(adau1701_i2c_remove), - .id_table = adau1701_i2c_id, + .probe = adau1701_i2c_probe, + .remove = __devexit_p(adau1701_i2c_remove), + .id_table = adau1701_i2c_id, }; -static int __init adau1701_modinit(void) +static int __init adau1701_init(void) { - int ret; - - ret = i2c_add_driver(&adau1701_i2c_driver); - if (ret != 0) - printk(KERN_ERR "Failed to register adau1701 I2C driver: %d\n", - ret); - - return ret; + return i2c_add_driver(&adau1701_i2c_driver); } -module_init(adau1701_modinit); +module_init(adau1701_init); static void __exit adau1701_exit(void) { @@ -463,5 +544,6 @@ static void __exit adau1701_exit(void) module_exit(adau1701_exit); MODULE_DESCRIPTION("ASoC ADAU1701 SigmaDSP driver"); -MODULE_AUTHOR("Cliff Cai"); +MODULE_AUTHOR("Cliff Cai <[email protected]>"); +MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/adau1701.h b/sound/soc/codecs/adau1701.h index d848fcb..8d0949a 100644 --- a/sound/soc/codecs/adau1701.h +++ b/sound/soc/codecs/adau1701.h @@ -9,104 +9,9 @@ #ifndef _ADAU1701_H #define _ADAU1701_H -/* - * Register definition. - */ -#define ADAU1701_FIRSTREG 0x0800 -#define ADAU1701_LASTREG 0x0827 -#define ADAU1701_IFACE0 0x0800 -#define ADAU1701_IFACE1 0x0801 -#define ADAU1701_IFACE2 0x0802 -#define ADAU1701_IFACE3 0x0803 -#define ADAU1701_IFACE4 0x0804 -#define ADAU1701_IFACE5 0x0805 -#define ADAU1701_IFACE6 0x0806 -#define ADAU1701_IFACE7 0x0807 - -#define ADAU1701_GPIOSET 0x0808 -#define ADAU1701_AUXADC0 0x0809 -#define ADAU1701_AUXADC1 0x080A -#define ADAU1701_AUXADC2 0x080B -#define ADAU1701_AUXADC3 0x080C - -#define ADAU1701_SAFELD0 0x0810 -#define ADAU1701_SAFELD1 0x0811 -#define ADAU1701_SAFELD2 0x0812 -#define ADAU1701_SAFELD3 0x0813 -#define ADAU1701_SAFELD4 0x0814 - -#define ADAU1701_SLDADD0 0x0815 -#define ADAU1701_SLDADD1 0x0816 -#define ADAU1701_SLDADD2 0x0817 -#define ADAU1701_SLDADD3 0x0818 -#define ADAU1701_SLDADD4 0x0819 - -#define ADAU1701_DATCAP0 0x081A -#define ADAU1701_DATCAP1 0x081B - -#define ADAU1701_DSPCTRL 0x081C -#define ADAU1701_DSPRES 0x081D -#define ADAU1701_SEROCTL 0x081E -#define ADAU1701_SERITL1 0x081F - -#define ADAU1701_MPCONF0 0x0820 -#define ADAU1701_MPCONF1 0x0821 - -#define ADAU1701_AUXNPOW 0x0822 -#define ADAU1701_AUXADCE 0x0824 - -#define ADAU1701_OSCIPOW 0x0826 -#define ADAU1701_DACSET 0x0827 - - -#define ADAU1701_NUMCACHEREG 0x29 - -/* Bit fields */ -#define ADAU1701_DSPCTRL_CR (1 << 2) -#define ADAU1701_DSPCTRL_DAM (1 << 3) -#define ADAU1701_DSPCTRL_ADM (1 << 4) -#define ADAU1701_DSPCTRL_IST (1 << 5) -#define ADAU1701_DSPCTRL_IFCW (1 << 6) -#define ADAU1701_DSPCTRL_GPCW (1 << 7) -#define ADAU1701_DSPCTRL_AACW (1 << 8) - -#define ADAU1701_MPCONF_GPIOIDE 0 -#define ADAU1701_MPCONF_GPIOINDE 1 -#define ADAU1701_MPCONF_GPIOOPT 2 -#define ADAU1701_MPCONF_OCOPT 3 -#define ADAU1701_MPCONF_SDATAP 4 -#define ADAU1701_MPCONF_GPIOIDEI 8 -#define ADAU1701_MPCONF_GPIOINDEI 9 -#define ADAU1701_MPCONF_GPIOOPTI 0xA -#define ADAU1701_MPCONF_OCOPTI 0xB -#define ADAU1701_MPCONF_SDATAPI 0xC -#define ADAU1701_MPCONF_AUXADC 0xF - -#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_OLF1024 0x0000 -#define ADAU1701_SEROCTL_OLF512 0x0080 -#define ADAU1701_SEROCTL_OLF256 0x0100 -#define ADAU1701_SEROCTL_OLFRSV 0x0180 - -#define ADAU1701_AUXNPOW_AAPD 0x80 -#define ADAU1701_AUXNPOW_VBPD 0x40 -#define ADAU1701_AUXNPOW_VRPD 0x20 -#define ADAU1701_AUXNPOW_D3PD 0x1 -#define ADAU1701_AUXNPOW_D2PD 0x2 -#define ADAU1701_AUXNPOW_D1PD 0x4 -#define ADAU1701_AUXNPOW_D0PD 0x8 - -#define ADAU1701_SERITL1_LEFTJ 1 -#define ADAU1701_SERITL1_TDM 2 -#define ADAU1701_SERITL1_MSK 7 - -#define ADAU1701_AUXADCE_AAEN (1 << 15) -#define ADAU1701_OSCIPOW_OPD 0x04 -#define ADAU1701_DACSET_DACEN 1 +enum adau1701_clk_src { + ADAU1701_CLK_SRC_OSC, + ADAU1701_CLK_SRC_MCLK, +}; #endif
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
