Skip to content

L
linux
Commit 40a49710 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files
Options

ASoC: da7210: convert to soc-cache 

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 48df93d4
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 78 deletions
sound/soc/codecs/da7210.c
View file @ 40a49710
...@@ -161,7 +161,6 @@ static const struct snd_kcontrol_new da7210_snd_controls[] = { ...@@ -161,7 +161,6 @@ static const struct snd_kcontrol_new da7210_snd_controls[] = {
/* Codec private data */ /* Codec private data */
struct da7210_priv { struct da7210_priv {
enum snd_soc_control_type control_type; enum snd_soc_control_type control_type;
void *control_data;
}; };
/* /*
...@@ -188,50 +187,16 @@ static const u8 da7210_reg[] = { ...@@ -188,50 +187,16 @@ static const u8 da7210_reg[] = {
0x00, /* R88 */ 0x00, /* R88 */
}; };
/* static int da7210_volatile_register(struct snd_soc_codec *codec,
* Read da7210 register cache unsigned int reg)
*/
static inline u32 da7210_read_reg_cache(struct snd_soc_codec *codec, u32 reg)
{
u8 *cache = codec->reg_cache;
BUG_ON(reg >= ARRAY_SIZE(da7210_reg));
return cache[reg];
}
/*
* Write to the da7210 register space
*/
static int da7210_write(struct snd_soc_codec *codec, u32 reg, u32 value)
{ {
u8 *cache = codec->reg_cache; switch (reg) {
u8 data[2]; case DA7210_STATUS:
return 1;
BUG_ON(codec->driver->volatile_register); default:
data[0] = reg & 0xff;
data[1] = value & 0xff;
if (reg >= codec->driver->reg_cache_size)
return -EIO;
if (2 != codec->hw_write(codec->control_data, data, 2))
return -EIO;
cache[reg] = value;
return 0; return 0;
}
} }
/*
* Read from the da7210 register space.
*/
static inline u32 da7210_read(struct snd_soc_codec *codec, u32 reg)
{
if (DA7210_STATUS == reg)
return i2c_smbus_read_byte_data(codec->control_data, reg);
return da7210_read_reg_cache(codec, reg);
}
static int da7210_startup(struct snd_pcm_substream *substream, static int da7210_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
...@@ -270,13 +235,13 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -270,13 +235,13 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
u32 fs, bypass; u32 fs, bypass;
/* set DAI source to Left and Right ADC */ /* set DAI source to Left and Right ADC */
da7210_write(codec, DA7210_DAI_SRC_SEL, snd_soc_write(codec, DA7210_DAI_SRC_SEL,
DA7210_DAI_OUT_R_SRC | DA7210_DAI_OUT_L_SRC); DA7210_DAI_OUT_R_SRC | DA7210_DAI_OUT_L_SRC);
/* Enable DAI */ /* Enable DAI */
da7210_write(codec, DA7210_DAI_CFG3, DA7210_DAI_OE | DA7210_DAI_EN); snd_soc_write(codec, DA7210_DAI_CFG3, DA7210_DAI_OE | DA7210_DAI_EN);
dai_cfg1 = 0xFC & da7210_read(codec, DA7210_DAI_CFG1); dai_cfg1 = 0xFC & snd_soc_read(codec, DA7210_DAI_CFG1);
switch (params_format(params)) { switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE: case SNDRV_PCM_FORMAT_S16_LE:
...@@ -289,7 +254,7 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -289,7 +254,7 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
da7210_write(codec, DA7210_DAI_CFG1, dai_cfg1); snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1);
hpf_reg = (SNDRV_PCM_STREAM_PLAYBACK == substream->stream) ? hpf_reg = (SNDRV_PCM_STREAM_PLAYBACK == substream->stream) ?
DA7210_DAC_HPF : DA7210_ADC_HPF; DA7210_DAC_HPF : DA7210_ADC_HPF;
...@@ -382,8 +347,8 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) ...@@ -382,8 +347,8 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
u32 dai_cfg1; u32 dai_cfg1;
u32 dai_cfg3; u32 dai_cfg3;
dai_cfg1 = 0x7f & da7210_read(codec, DA7210_DAI_CFG1); dai_cfg1 = 0x7f & snd_soc_read(codec, DA7210_DAI_CFG1);
dai_cfg3 = 0xfc & da7210_read(codec, DA7210_DAI_CFG3); dai_cfg3 = 0xfc & snd_soc_read(codec, DA7210_DAI_CFG3);
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBM_CFM:
...@@ -411,8 +376,8 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) ...@@ -411,8 +376,8 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
*/ */
dai_cfg1 |= DA7210_DAI_FLEN_64BIT; dai_cfg1 |= DA7210_DAI_FLEN_64BIT;
da7210_write(codec, DA7210_DAI_CFG1, dai_cfg1); snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1);
da7210_write(codec, DA7210_DAI_CFG3, dai_cfg3); snd_soc_write(codec, DA7210_DAI_CFG3, dai_cfg3);
return 0; return 0;
} }
...@@ -451,11 +416,15 @@ static struct snd_soc_dai_driver da7210_dai = { ...@@ -451,11 +416,15 @@ static struct snd_soc_dai_driver da7210_dai = {
static int da7210_probe(struct snd_soc_codec *codec) static int da7210_probe(struct snd_soc_codec *codec)
{ {
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);
int ret;
dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
codec->control_data = da7210->control_data; ret = snd_soc_codec_set_cache_io(codec, 8, 8, da7210->control_type);
codec->hw_write = (hw_write_t)i2c_master_send; if (ret < 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
return ret;
}
/* FIXME /* FIXME
* *
...@@ -472,8 +441,8 @@ static int da7210_probe(struct snd_soc_codec *codec) ...@@ -472,8 +441,8 @@ static int da7210_probe(struct snd_soc_codec *codec)
/* /*
* make sure that DA7210 use bypass mode before start up * make sure that DA7210 use bypass mode before start up
*/ */
da7210_write(codec, DA7210_STARTUP1, 0); snd_soc_write(codec, DA7210_STARTUP1, 0);
da7210_write(codec, DA7210_PLL_DIV3, snd_soc_write(codec, DA7210_PLL_DIV3,
DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP);
/* /*
...@@ -481,36 +450,36 @@ static int da7210_probe(struct snd_soc_codec *codec) ...@@ -481,36 +450,36 @@ static int da7210_probe(struct snd_soc_codec *codec)
*/ */
/* Enable Left & Right MIC PGA and Mic Bias */ /* Enable Left & Right MIC PGA and Mic Bias */
da7210_write(codec, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN); snd_soc_write(codec, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN);
da7210_write(codec, DA7210_MIC_R, DA7210_MIC_R_EN); snd_soc_write(codec, DA7210_MIC_R, DA7210_MIC_R_EN);
/* Enable Left and Right input PGA */ /* Enable Left and Right input PGA */
da7210_write(codec, DA7210_INMIX_L, DA7210_IN_L_EN); snd_soc_write(codec, DA7210_INMIX_L, DA7210_IN_L_EN);
da7210_write(codec, DA7210_INMIX_R, DA7210_IN_R_EN); snd_soc_write(codec, DA7210_INMIX_R, DA7210_IN_R_EN);
/* Enable Left and Right ADC */ /* Enable Left and Right ADC */
da7210_write(codec, DA7210_ADC, DA7210_ADC_L_EN | DA7210_ADC_R_EN); snd_soc_write(codec, DA7210_ADC, DA7210_ADC_L_EN | DA7210_ADC_R_EN);
/* /*
* DAC settings * DAC settings
*/ */
/* Enable Left and Right DAC */ /* Enable Left and Right DAC */
da7210_write(codec, DA7210_DAC_SEL, snd_soc_write(codec, DA7210_DAC_SEL,
DA7210_DAC_L_SRC_DAI_L | DA7210_DAC_L_EN | DA7210_DAC_L_SRC_DAI_L | DA7210_DAC_L_EN |
DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN); DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN);
/* Enable Left and Right out PGA */ /* Enable Left and Right out PGA */
da7210_write(codec, DA7210_OUTMIX_L, DA7210_OUT_L_EN); snd_soc_write(codec, DA7210_OUTMIX_L, DA7210_OUT_L_EN);
da7210_write(codec, DA7210_OUTMIX_R, DA7210_OUT_R_EN); snd_soc_write(codec, DA7210_OUTMIX_R, DA7210_OUT_R_EN);
/* Enable Left and Right HeadPhone PGA */ /* Enable Left and Right HeadPhone PGA */
da7210_write(codec, DA7210_HP_CFG, snd_soc_write(codec, DA7210_HP_CFG,
DA7210_HP_2CAP_MODE | DA7210_HP_SENSE_EN | DA7210_HP_2CAP_MODE | DA7210_HP_SENSE_EN |
DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN); DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN);
/* Diable PLL and bypass it */ /* Diable PLL and bypass it */
da7210_write(codec, DA7210_PLL, DA7210_PLL_FS_48000); snd_soc_write(codec, DA7210_PLL, DA7210_PLL_FS_48000);
/* /*
* If 48kHz sound came, it use bypass mode, * If 48kHz sound came, it use bypass mode,
...@@ -521,22 +490,22 @@ static int da7210_probe(struct snd_soc_codec *codec) ...@@ -521,22 +490,22 @@ static int da7210_probe(struct snd_soc_codec *codec)
* DA7210_PLL_DIV3 :: DA7210_PLL_BYP bit. * DA7210_PLL_DIV3 :: DA7210_PLL_BYP bit.
* see da7210_hw_params * see da7210_hw_params
*/ */
da7210_write(codec, DA7210_PLL_DIV1, 0xE5); /* MCLK = 12.288MHz */ snd_soc_write(codec, DA7210_PLL_DIV1, 0xE5); /* MCLK = 12.288MHz */
da7210_write(codec, DA7210_PLL_DIV2, 0x99); snd_soc_write(codec, DA7210_PLL_DIV2, 0x99);
da7210_write(codec, DA7210_PLL_DIV3, 0x0A | snd_soc_write(codec, DA7210_PLL_DIV3, 0x0A |
DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP);
snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN); snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN);
/* As suggested by Dialog */ /* As suggested by Dialog */
da7210_write(codec, DA7210_A_HID_UNLOCK, 0x8B); /* unlock */ snd_soc_write(codec, DA7210_A_HID_UNLOCK, 0x8B); /* unlock */
da7210_write(codec, DA7210_A_TEST_UNLOCK, 0xB4); snd_soc_write(codec, DA7210_A_TEST_UNLOCK, 0xB4);
da7210_write(codec, DA7210_A_PLL1, 0x01); snd_soc_write(codec, DA7210_A_PLL1, 0x01);
da7210_write(codec, DA7210_A_CP_MODE, 0x7C); snd_soc_write(codec, DA7210_A_CP_MODE, 0x7C);
da7210_write(codec, DA7210_A_HID_UNLOCK, 0x00); /* re-lock */ snd_soc_write(codec, DA7210_A_HID_UNLOCK, 0x00); /* re-lock */
da7210_write(codec, DA7210_A_TEST_UNLOCK, 0x00); snd_soc_write(codec, DA7210_A_TEST_UNLOCK, 0x00);
/* Activate all enabled subsystem */ /* Activate all enabled subsystem */
da7210_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN);
snd_soc_add_controls(codec, da7210_snd_controls, snd_soc_add_controls(codec, da7210_snd_controls,
ARRAY_SIZE(da7210_snd_controls)); ARRAY_SIZE(da7210_snd_controls));
...@@ -548,11 +517,10 @@ static int da7210_probe(struct snd_soc_codec *codec) ...@@ -548,11 +517,10 @@ static int da7210_probe(struct snd_soc_codec *codec)
static struct snd_soc_codec_driver soc_codec_dev_da7210 = { static struct snd_soc_codec_driver soc_codec_dev_da7210 = {
.probe = da7210_probe, .probe = da7210_probe,
.read = da7210_read,
.write = da7210_write,
.reg_cache_size = ARRAY_SIZE(da7210_reg), .reg_cache_size = ARRAY_SIZE(da7210_reg),
.reg_word_size = sizeof(u8), .reg_word_size = sizeof(u8),
.reg_cache_default = da7210_reg, .reg_cache_default = da7210_reg,
.volatile_register = da7210_volatile_register,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
...@@ -567,7 +535,6 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, ...@@ -567,7 +535,6 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
return -ENOMEM; return -ENOMEM;
i2c_set_clientdata(i2c, da7210); i2c_set_clientdata(i2c, da7210);
da7210->control_data = i2c;
da7210->control_type = SND_SOC_I2C; da7210->control_type = SND_SOC_I2C;
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7