From: Oder Chiou <oder_chiou@realtek.com>
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: Oder Chiou <oder_chiou@realtek.com>,
alsa-devel@alsa-project.org, john.lin@realtek.com,
benzh@google.com, anatol@google.com, bardliao@realtek.com,
flove@realtek.com
Subject: [PATCH] ASoC: rt5677: Fix the issue that the private value cannot be accessed
Date: Fri, 21 Nov 2014 09:54:38 +0800 [thread overview]
Message-ID: <1416534878-25279-1-git-send-email-oder_chiou@realtek.com> (raw)
Fix the issue that the private value cannot be accessed.
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
---
sound/soc/codecs/rt5677.c | 37 ++++++++++++++++++++++++++++++-------
sound/soc/codecs/rt5677.h | 2 +-
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index f2211f1..133010d 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4287,6 +4287,7 @@ static int rt5677_probe(struct snd_soc_codec *codec)
}
mutex_init(&rt5677->dsp_cmd_lock);
+ mutex_init(&rt5677->dsp_pri_lock);
return 0;
}
@@ -4344,10 +4345,19 @@ static int rt5677_read(void *context, unsigned int reg, unsigned int *val)
struct i2c_client *client = context;
struct rt5677_priv *rt5677 = i2c_get_clientdata(client);
- if (rt5677->is_dsp_mode)
- rt5677_dsp_mode_i2c_read(rt5677, reg, val);
- else
+ if (rt5677->is_dsp_mode) {
+ if (reg > 0xff) {
+ 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);
+ }
return 0;
}
@@ -4357,10 +4367,20 @@ static int rt5677_write(void *context, unsigned int reg, unsigned int val)
struct i2c_client *client = context;
struct rt5677_priv *rt5677 = i2c_get_clientdata(client);
- if (rt5677->is_dsp_mode)
- rt5677_dsp_mode_i2c_write(rt5677, reg, val);
- else
+ if (rt5677->is_dsp_mode) {
+ if (reg > 0xff) {
+ 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);
+ }
return 0;
}
@@ -4495,10 +4515,13 @@ static const struct regmap_config rt5677_regmap_physical = {
.reg_bits = 8,
.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,
.cache_type = REGCACHE_NONE,
+ .ranges = rt5677_ranges,
+ .num_ranges = ARRAY_SIZE(rt5677_ranges),
};
static const struct regmap_config rt5677_regmap = {
diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h
index a02f64c..dbd9ffd 100644
--- a/sound/soc/codecs/rt5677.h
+++ b/sound/soc/codecs/rt5677.h
@@ -1670,7 +1670,7 @@ struct rt5677_priv {
struct rt5677_platform_data pdata;
struct regmap *regmap, *regmap_physical;
const struct firmware *fw1, *fw2;
- struct mutex dsp_cmd_lock;
+ struct mutex dsp_cmd_lock, dsp_pri_lock;
int sysclk;
int sysclk_src;
--
1.8.1.1.439.g50a6b54
next reply other threads:[~2014-11-21 1:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 1:54 Oder Chiou [this message]
2014-11-21 18:15 ` [PATCH] ASoC: rt5677: Fix the issue that the private value cannot be accessed Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416534878-25279-1-git-send-email-oder_chiou@realtek.com \
--to=oder_chiou@realtek.com \
--cc=alsa-devel@alsa-project.org \
--cc=anatol@google.com \
--cc=bardliao@realtek.com \
--cc=benzh@google.com \
--cc=broonie@kernel.org \
--cc=flove@realtek.com \
--cc=john.lin@realtek.com \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox