* [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap
@ 2014-02-22 17:32 Lars-Peter Clausen
2014-02-22 17:32 ` [PATCH 2/2] ASoC: wm8962: Replace codec->control_data with wm8962->regmap Lars-Peter Clausen
2014-02-25 4:35 ` [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Lars-Peter Clausen @ 2014-02-22 17:32 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: Charles Keepax, patches, alsa-devel, Lars-Peter Clausen
With the ongoing component-ization of the ASoC framework and the continuing
migration to using regmap for IO the control_data field of the snd_soc_codec
struct will eventually be removed. Prepare the wm8996 driver for this by using
wm8996->regmap instead of accessing the CODEC's control_data field.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/codecs/wm8996.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 0330165..e2d0dd7 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -1608,8 +1608,8 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec,
msleep(5);
}
- regcache_cache_only(codec->control_data, false);
- regcache_sync(codec->control_data);
+ regcache_cache_only(wm8996->regmap, false);
+ regcache_sync(wm8996->regmap);
}
/* Bypass the MICBIASes for lowest power */
@@ -1620,10 +1620,10 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec,
break;
case SND_SOC_BIAS_OFF:
- regcache_cache_only(codec->control_data, true);
+ regcache_cache_only(wm8996->regmap, true);
if (wm8996->pdata.ldo_ena >= 0) {
gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);
- regcache_cache_only(codec->control_data, true);
+ regcache_cache_only(wm8996->regmap, true);
}
regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies),
wm8996->supplies);
--
1.8.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ASoC: wm8962: Replace codec->control_data with wm8962->regmap
2014-02-22 17:32 [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap Lars-Peter Clausen
@ 2014-02-22 17:32 ` Lars-Peter Clausen
2014-02-25 4:36 ` Mark Brown
2014-02-25 4:35 ` [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Lars-Peter Clausen @ 2014-02-22 17:32 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: Charles Keepax, patches, alsa-devel, Lars-Peter Clausen
With the ongoing component-ization of the ASoC framework and the continuing
migration to using regmap for IO the control_data field of the snd_soc_codec
struct will eventually be removed. Prepare the wm8962 driver for this by using
wm8962->regmap instead of accessing the CODEC's control_data field.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/codecs/wm8962.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 3be4633..b6086d2 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1479,7 +1479,9 @@ static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);
static int wm8962_dsp2_write_config(struct snd_soc_codec *codec)
{
- return regcache_sync_region(codec->control_data,
+ struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
+
+ return regcache_sync_region(wm8962->regmap,
WM8962_HDBASS_AI_1, WM8962_MAX_REGISTER);
}
--
1.8.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap
2014-02-22 17:32 [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap Lars-Peter Clausen
2014-02-22 17:32 ` [PATCH 2/2] ASoC: wm8962: Replace codec->control_data with wm8962->regmap Lars-Peter Clausen
@ 2014-02-25 4:35 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-02-25 4:35 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Charles Keepax, patches, Liam Girdwood, alsa-devel
[-- Attachment #1.1: Type: text/plain, Size: 394 bytes --]
On Sat, Feb 22, 2014 at 06:32:04PM +0100, Lars-Peter Clausen wrote:
> With the ongoing component-ization of the ASoC framework and the continuing
> migration to using regmap for IO the control_data field of the snd_soc_codec
> struct will eventually be removed. Prepare the wm8996 driver for this by using
> wm8996->regmap instead of accessing the CODEC's control_data field.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ASoC: wm8962: Replace codec->control_data with wm8962->regmap
2014-02-22 17:32 ` [PATCH 2/2] ASoC: wm8962: Replace codec->control_data with wm8962->regmap Lars-Peter Clausen
@ 2014-02-25 4:36 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-02-25 4:36 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Charles Keepax, patches, Liam Girdwood, alsa-devel
[-- Attachment #1.1: Type: text/plain, Size: 394 bytes --]
On Sat, Feb 22, 2014 at 06:32:05PM +0100, Lars-Peter Clausen wrote:
> With the ongoing component-ization of the ASoC framework and the continuing
> migration to using regmap for IO the control_data field of the snd_soc_codec
> struct will eventually be removed. Prepare the wm8962 driver for this by using
> wm8962->regmap instead of accessing the CODEC's control_data field.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-25 4:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-22 17:32 [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap Lars-Peter Clausen
2014-02-22 17:32 ` [PATCH 2/2] ASoC: wm8962: Replace codec->control_data with wm8962->regmap Lars-Peter Clausen
2014-02-25 4:36 ` Mark Brown
2014-02-25 4:35 ` [PATCH 1/2] ASoC: wm8996: Replace codec->control_data with wm8996->regmap Mark Brown
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.