leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: lm4857: Convert to regmap

Browse Source 
Use regmap for IO for the lm4857 driver instead of open-coding the IO read/write
functions.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2013-07-28 18:45:29 +02:00 committed by Mark Brown
parent 07ccc0f4f1
commit 9b2709687a
1 changed files with 26 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
sound/soc/codecs/lm4857.c
View File

@ -16,6 +16,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <sound/core.h> #include <sound/core.h>
@ -23,12 +24,15 @@
#include <sound/tlv.h> #include <sound/tlv.h>
struct lm4857 { struct lm4857 {
struct i2c_client *i2c; struct regmap *regmap;
uint8_t mode; uint8_t mode;
}; };
static const uint8_t lm4857_default_regs[] = { static const struct reg_default lm4857_default_regs[] = {
0x00, 0x00, 0x00, 0x00, { 0x0, 0x00 },
{ 0x1, 0x00 },
{ 0x2, 0x00 },
{ 0x3, 0x00 },
}; };
/* The register offsets in the cache array */ /* The register offsets in the cache array */
@ -42,39 +46,6 @@ static const uint8_t lm4857_default_regs[] = {
#define LM4857_WAKEUP 5 #define LM4857_WAKEUP 5
#define LM4857_EPGAIN 4 #define LM4857_EPGAIN 4
static int lm4857_write(struct snd_soc_codec *codec, unsigned int reg,
unsigned int value)
{
uint8_t data;
int ret;
ret = snd_soc_cache_write(codec, reg, value);
if (ret < 0)
return ret;
data = (reg << 6) | value;
ret = i2c_master_send(codec->control_data, &data, 1);
if (ret != 1) {
dev_err(codec->dev, "Failed to write register: %d\n", ret);
return ret;
}
return 0;
}
static unsigned int lm4857_read(struct snd_soc_codec *codec,
unsigned int reg)
{
unsigned int val;
int ret;
ret = snd_soc_cache_read(codec, reg, &val);
if (ret)
return -1;
return val;
}
static int lm4857_get_mode(struct snd_kcontrol *kcontrol, static int lm4857_get_mode(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
@ -96,7 +67,7 @@ static int lm4857_set_mode(struct snd_kcontrol *kcontrol,
lm4857->mode = value; lm4857->mode = value;
if (codec->dapm.bias_level == SND_SOC_BIAS_ON) if (codec->dapm.bias_level == SND_SOC_BIAS_ON)
snd_soc_update_bits(codec, LM4857_CTRL, 0x0F, value + 6); regmap_update_bits(lm4857->regmap, LM4857_CTRL, 0x0F, value + 6);
return 1; return 1;
} }
@ -108,10 +79,11 @@ static int lm4857_set_bias_level(struct snd_soc_codec *codec,
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
snd_soc_update_bits(codec, LM4857_CTRL, 0x0F, lm4857->mode + 6); regmap_update_bits(lm4857->regmap, LM4857_CTRL, 0x0F,
lm4857->mode + 6);
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
snd_soc_update_bits(codec, LM4857_CTRL, 0x0F, 0); regmap_update_bits(lm4857->regmap, LM4857_CTRL, 0x0F, 0);
break; break;
default: default:
break; break;
@ -171,22 +143,7 @@ static const struct snd_soc_dapm_route lm4857_routes[] = {
{"EP", NULL, "IN"}, {"EP", NULL, "IN"},
}; };
static int lm4857_probe(struct snd_soc_codec *codec)
{
struct lm4857 *lm4857 = snd_soc_codec_get_drvdata(codec);
codec->control_data = lm4857->i2c;
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_lm4857 = { static struct snd_soc_codec_driver soc_codec_dev_lm4857 = {
.write = lm4857_write,
.read = lm4857_read,
.probe = lm4857_probe,
.reg_cache_size = ARRAY_SIZE(lm4857_default_regs),
.reg_word_size = sizeof(uint8_t),
.reg_cache_default = lm4857_default_regs,
.set_bias_level = lm4857_set_bias_level, .set_bias_level = lm4857_set_bias_level,
.controls = lm4857_controls, .controls = lm4857_controls,
@ -197,11 +154,21 @@ static struct snd_soc_codec_driver soc_codec_dev_lm4857 = {
.num_dapm_routes = ARRAY_SIZE(lm4857_routes), .num_dapm_routes = ARRAY_SIZE(lm4857_routes),
}; };
static const struct regmap_config lm4857_regmap_config = {
.val_bits = 6,
.reg_bits = 2,
.max_register = LM4857_CTRL,
.cache_type = REGCACHE_FLAT,
.reg_defaults = lm4857_default_regs,
.num_reg_defaults = ARRAY_SIZE(lm4857_default_regs),
};
static int lm4857_i2c_probe(struct i2c_client *i2c, static int lm4857_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct lm4857 *lm4857; struct lm4857 *lm4857;
int ret;
lm4857 = devm_kzalloc(&i2c->dev, sizeof(*lm4857), GFP_KERNEL); lm4857 = devm_kzalloc(&i2c->dev, sizeof(*lm4857), GFP_KERNEL);
if (!lm4857) if (!lm4857)
@ -209,11 +176,11 @@ static int lm4857_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, lm4857); i2c_set_clientdata(i2c, lm4857);
lm4857->i2c = i2c; lm4857->regmap = devm_regmap_init_i2c(i2c, &lm4857_regmap_config);
if (IS_ERR(lm4857->regmap))
return PTR_ERR(lm4857->regmap);
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_lm4857, NULL, 0); return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_lm4857, NULL, 0);
return ret;
} }
static int lm4857_i2c_remove(struct i2c_client *i2c) static int lm4857_i2c_remove(struct i2c_client *i2c)