openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rt5677: Fix the issue that the regmap_range "rt5677_ranges" cannot be accessed 

After the patch "ASoC: rt5677: Use specific r/w function for DSP mode", the
regmap_range "rt5677_ranges" was not registered in rt5677_regmap_physical, and
it caused that the regmap_range "rt5677_ranges" cannot be accessed by the
specific r/w function. The patch fixes this issue.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Oder Chiou 2014-11-25 09:51:41 +08:00 committed by Mark Brown
parent 683996cb22
commit 6fe17da00b
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sound/soc/codecs/rt5677.c
View File

@ -4287,6 +4287,7 @@ static int rt5677_probe(struct snd_soc_codec *codec)
} }
mutex_init(&rt5677->dsp_cmd_lock); mutex_init(&rt5677->dsp_cmd_lock);
mutex_init(&rt5677->dsp_pri_lock);
return 0; return 0;
} }
@ -4344,10 +4345,19 @@ static int rt5677_read(void *context, unsigned int reg, unsigned int *val)
struct i2c_client *client = context; struct i2c_client *client = context;
struct rt5677_priv *rt5677 = i2c_get_clientdata(client); struct rt5677_priv *rt5677 = i2c_get_clientdata(client);
if (rt5677->is_dsp_mode) if (rt5677->is_dsp_mode) {
rt5677_dsp_mode_i2c_read(rt5677, reg, val); if (reg > 0xff) {
else mutex_lock(&rt5677->dsp_pri_lock);
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
reg & 0xff);
rt5677_dsp_mode_i2c_read(rt5677, RT5677_PRIV_DATA, val);
mutex_unlock(&rt5677->dsp_pri_lock);
} else {
rt5677_dsp_mode_i2c_read(rt5677, reg, val);
}
} else {
regmap_read(rt5677->regmap_physical, reg, val); regmap_read(rt5677->regmap_physical, reg, val);
}
return 0; return 0;
} }
@ -4357,10 +4367,20 @@ static int rt5677_write(void *context, unsigned int reg, unsigned int val)
struct i2c_client *client = context; struct i2c_client *client = context;
struct rt5677_priv *rt5677 = i2c_get_clientdata(client); struct rt5677_priv *rt5677 = i2c_get_clientdata(client);
if (rt5677->is_dsp_mode) if (rt5677->is_dsp_mode) {
rt5677_dsp_mode_i2c_write(rt5677, reg, val); if (reg > 0xff) {
else mutex_lock(&rt5677->dsp_pri_lock);
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
reg & 0xff);
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_DATA,
val);
mutex_unlock(&rt5677->dsp_pri_lock);
} else {
rt5677_dsp_mode_i2c_write(rt5677, reg, val);
}
} else {
regmap_write(rt5677->regmap_physical, reg, val); regmap_write(rt5677->regmap_physical, reg, val);
}
return 0; return 0;
} }
@ -4495,10 +4515,13 @@ static const struct regmap_config rt5677_regmap_physical = {
.reg_bits = 8, .reg_bits = 8,
.val_bits = 16, .val_bits = 16,
.max_register = RT5677_VENDOR_ID2 + 1, .max_register = RT5677_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5677_ranges) *
RT5677_PR_SPACING),
.readable_reg = rt5677_readable_register, .readable_reg = rt5677_readable_register,
.cache_type = REGCACHE_NONE, .cache_type = REGCACHE_NONE,
.ranges = rt5677_ranges,
.num_ranges = ARRAY_SIZE(rt5677_ranges),
}; };
static const struct regmap_config rt5677_regmap = { static const struct regmap_config rt5677_regmap = {

2
sound/soc/codecs/rt5677.h
View File

@ -1670,7 +1670,7 @@ struct rt5677_priv {
struct rt5677_platform_data pdata; struct rt5677_platform_data pdata;
struct regmap *regmap, *regmap_physical; struct regmap *regmap, *regmap_physical;
const struct firmware *fw1, *fw2; const struct firmware *fw1, *fw2;
struct mutex dsp_cmd_lock; struct mutex dsp_cmd_lock, dsp_pri_lock;
int sysclk; int sysclk;
int sysclk_src; int sysclk_src;