From mboxrd@z Thu Jan 1 00:00:00 1970 From: Charles Keepax Subject: Re: [PATCHv3 7/9] WM8971 improves the function of regmap Date: Tue, 2 Sep 2014 12:03:50 +0100 Message-ID: <20140902110350.GH12043@opensource.wolfsonmicro.com> References: <1409628470-13059-1-git-send-email-xavier.hsu@linaro.org> <1409628470-13059-7-git-send-email-xavier.hsu@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from opensource.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id A0CB1264F53 for ; Tue, 2 Sep 2014 13:03:51 +0200 (CEST) Content-Disposition: inline In-Reply-To: <1409628470-13059-7-git-send-email-xavier.hsu@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Xavier Hsu Cc: Andy Green , alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, patches@linaro.org List-Id: alsa-devel@alsa-project.org On Tue, Sep 02, 2014 at 11:27:48AM +0800, Xavier Hsu wrote: > This patch improves WM8971. > We modify the function of regmap. > > Any comments about improving the patch are welcome. > Thanks. Again move this stuff to after the --- > > Signed-off-by: Xavier Hsu > Signed-off-by: Andy Green > --- > sound/soc/codecs/wm8971.c | 26 +++++++++++++++++++++----- > 1 file changed, 21 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c > index 68b4f52..95e7c39 100755 > --- a/sound/soc/codecs/wm8971.c > +++ b/sound/soc/codecs/wm8971.c > @@ -38,6 +38,7 @@ > > /* codec private data */ > struct wm8971_priv { > + struct regmap *regmap; > unsigned int sysclk; > struct snd_pcm_hw_constraint_list *sysclk_constraints; > int playback_fs; > @@ -716,6 +717,7 @@ static int wm8971_mute(struct snd_soc_dai *dai, int mute) > static int wm8971_set_bias_level(struct snd_soc_codec *codec, > enum snd_soc_bias_level level) > { > + struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); > u16 pwr_reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e; > > switch (level) { > @@ -727,7 +729,7 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec, > break; > case SND_SOC_BIAS_STANDBY: > if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) > - snd_soc_cache_sync(codec); > + regcache_sync(wm8971->regmap); > > /* mute dac and set vmid to 500k, enable VREF */ > snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140); > @@ -774,7 +776,11 @@ static struct snd_soc_dai_driver wm8971_dai = { > > static int wm8971_suspend(struct snd_soc_codec *codec) > { > + struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); > + > wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF); > + regcache_mark_dirty(wm8971->regmap); > + > return 0; > } > > @@ -797,9 +803,12 @@ static int wm8971_resume(struct snd_soc_codec *codec) > > static int wm8971_probe(struct snd_soc_codec *codec) > { > + struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); > int ret = 0; > u16 reg; > > + codec->control_data = wm8971->regmap; > + I don't think this is necessary anymore? Now you have the get_regmap callback. > wm8971_reset(codec); > > /* charge output caps - set vmid to 5k for quick power up */ > @@ -830,12 +839,20 @@ static int wm8971_remove(struct snd_soc_codec *codec) > return 0; > } > > +struct regmap *wm8971_get_regmap(struct device *dev) > +{ > + struct wm8971_priv *priv = dev_get_drvdata(dev); > + > + return priv->regmap; > +} This function should be marked static. > + > static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { > .probe = wm8971_probe, > .remove = wm8971_remove, > .suspend = wm8971_suspend, > .resume = wm8971_resume, > .set_bias_level = wm8971_set_bias_level, > + .get_regmap = wm8971_get_regmap, > > .controls = wm8971_snd_controls, > .num_controls = ARRAY_SIZE(wm8971_snd_controls), > @@ -859,7 +876,6 @@ static int wm8971_i2c_probe(struct i2c_client *i2c, > const struct i2c_device_id *id) > { > struct wm8971_priv *wm8971; > - struct regmap *regmap; > int ret; > > wm8971 = devm_kzalloc(&i2c->dev, sizeof(struct wm8971_priv), > @@ -867,9 +883,9 @@ static int wm8971_i2c_probe(struct i2c_client *i2c, > if (wm8971 == NULL) > return -ENOMEM; > > - regmap = devm_regmap_init_i2c(i2c, &wm8971_regmap); > - if (IS_ERR(regmap)) > - return PTR_ERR(regmap); > + wm8971->regmap = devm_regmap_init_i2c(i2c, &wm8971_regmap); > + if (IS_ERR(wm8971->regmap)) > + return PTR_ERR(wm8971->regmap); > > i2c_set_clientdata(i2c, wm8971); > > -- Thanks, Charles