From: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
To: Mark Brown <broonie@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Lee Jones <lee.jones@linaro.org>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Richard Fitzgerald <rf@opensource.wolfsonmicro.com>,
Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Subject: [PATCH 2/2] ASoC: wm5110: Use reg_sequence for multi_reg_write/register_patch
Date: Fri, 17 Jul 2015 15:11:10 +0100 [thread overview]
Message-ID: <20150717141110.GH21939@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20150717103450.GJ11162@sirena.org.uk>
Introduced by:
commit 8019ff6cfc04
("regmap: Use reg_sequence for multi_reg_write / register_patch")
Interacting with:
commit d1acd31883d7
("ASoC: wm5110: Add special DRE on/off handling for the headphone path")
Signed-off-by: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm5110.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index df6a998..9756578 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -185,7 +185,7 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
return 0;
}
-static const struct reg_default wm5110_no_dre_left_enable[] = {
+static const struct reg_sequence wm5110_no_dre_left_enable[] = {
{ 0x3024, 0xE410 },
{ 0x3025, 0x0056 },
{ 0x301B, 0x0224 },
@@ -203,7 +203,7 @@ static const struct reg_default wm5110_no_dre_left_enable[] = {
{ 0x3039, 0x3080 },
};
-static const struct reg_default wm5110_dre_left_enable[] = {
+static const struct reg_sequence wm5110_dre_left_enable[] = {
{ 0x3024, 0x0231 },
{ 0x3025, 0x0B00 },
{ 0x301B, 0x0227 },
@@ -221,7 +221,7 @@ static const struct reg_default wm5110_dre_left_enable[] = {
{ 0x3039, 0x0B00 },
};
-static const struct reg_default wm5110_no_dre_right_enable[] = {
+static const struct reg_sequence wm5110_no_dre_right_enable[] = {
{ 0x3074, 0xE414 },
{ 0x3075, 0x0056 },
{ 0x306B, 0x0224 },
@@ -239,7 +239,7 @@ static const struct reg_default wm5110_no_dre_right_enable[] = {
{ 0x3089, 0x3080 },
};
-static const struct reg_default wm5110_dre_right_enable[] = {
+static const struct reg_sequence wm5110_dre_right_enable[] = {
{ 0x3074, 0x0231 },
{ 0x3075, 0x0B00 },
{ 0x306B, 0x0227 },
@@ -263,7 +263,7 @@ static int wm5110_hp_pre_enable(struct snd_soc_dapm_widget *w)
struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
struct arizona *arizona = priv->arizona;
unsigned int val = snd_soc_read(codec, ARIZONA_DRE_ENABLE);
- const struct reg_default *wseq;
+ const struct reg_sequence *wseq;
int nregs;
switch (w->shift) {
@@ -354,7 +354,7 @@ static int wm5110_hp_ev(struct snd_soc_dapm_widget *w,
static int wm5110_clear_pga_volume(struct arizona *arizona, int output)
{
- struct reg_default clear_pga = {
+ struct reg_sequence clear_pga = {
ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4, 0x80
};
int ret;
--
2.1.4
next prev parent reply other threads:[~2015-07-17 14:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-17 4:39 linux-next: build warnings after merge of the regmap tree Stephen Rothwell
2015-07-17 9:44 ` Nariman Poushin
2015-07-17 10:34 ` Mark Brown
2015-07-17 14:09 ` [PATCH 1/2] mfd: Fixup clients of multi_reg_write/register_patch Nariman Poushin
2015-07-17 17:57 ` Mark Brown
2015-07-20 1:59 ` Stephen Rothwell
2015-09-05 14:08 ` Geert Uytterhoeven
2015-09-18 3:50 ` Stephen Rothwell
2015-09-18 8:33 ` Charles Keepax
2015-09-18 8:33 ` Charles Keepax
2015-09-18 10:25 ` Mark Brown
2015-07-17 14:11 ` Nariman Poushin [this message]
2015-07-17 15:29 ` linux-next: build warnings after merge of the regmap tree Nariman Poushin
2015-07-17 16:45 ` Charles Keepax
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=20150717141110.GH21939@opensource.wolfsonmicro.com \
--to=nariman@opensource.wolfsonmicro.com \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rf@opensource.wolfsonmicro.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.