| Message ID | 1445983102-15490-1-git-send-email-robert.jarzmik@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 27, 2015 at 10:58:21PM +0100, Robert Jarzmik wrote: > Convert the Wolfson WM9713 to regmap API. This will leverage all the > regmap functions (debug, registers update, etc ...). > > As a bonus, this will pave the path to gpio chip introduction, and > devicetree support. > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > --- > Since v1: fix suspend/resume (that specific part is not tested yet) > Since v2: split out the snd_soc_*() from regmap support > --- > sound/soc/codecs/Kconfig | 1 + > sound/soc/codecs/wm9713.c | 182 ++++++++++++++++++++++++++++------------------ > 2 files changed, 114 insertions(+), 69 deletions(-) > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > index 0c9733ecd17f..ba306f8f3717 100644 > --- a/sound/soc/codecs/Kconfig > +++ b/sound/soc/codecs/Kconfig > @@ -879,6 +879,7 @@ config SND_SOC_WM9712 > > config SND_SOC_WM9713 > tristate > + select REGMAP_AC97 > > # Amp > config SND_SOC_LM4857 > diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c > index 4083a5130cbd..8e2cc1112e40 100644 > --- a/sound/soc/codecs/wm9713.c > +++ b/sound/soc/codecs/wm9713.c > @@ -19,6 +19,7 @@ > #include <linux/slab.h> > #include <linux/module.h> > #include <linux/device.h> > +#include <linux/regmap.h> > #include <sound/core.h> > #include <sound/pcm.h> > #include <sound/ac97_codec.h> > @@ -39,33 +40,15 @@ struct wm9713_priv { > struct mutex lock; > }; > > -static unsigned int ac97_read(struct snd_soc_codec *codec, > - unsigned int reg); > -static int ac97_write(struct snd_soc_codec *codec, > - unsigned int reg, unsigned int val); > - > -/* > - * WM9713 register cache > - * Reg 0x3c bit 15 is used by touch driver. > - */ > -static const u16 wm9713_reg[] = { > - 0x6174, 0x8080, 0x8080, 0x8080, > - 0xc880, 0xe808, 0xe808, 0x0808, > - 0x00da, 0x8000, 0xd600, 0xaaa0, > - 0xaaa0, 0xaaa0, 0x0000, 0x0000, > - 0x0f0f, 0x0040, 0x0000, 0x7f00, > - 0x0405, 0x0410, 0xbb80, 0xbb80, > - 0x0000, 0xbb80, 0x0000, 0x4523, > - 0x0000, 0x2000, 0x7eff, 0xffff, > - 0x0000, 0x0000, 0x0080, 0x0000, > - 0x0000, 0x0000, 0xfffe, 0xffff, > - 0x0000, 0x0000, 0x0000, 0xfffe, > - 0x4000, 0x0000, 0x0000, 0x0000, > - 0xb032, 0x3e00, 0x0000, 0x0000, > - 0x0000, 0x0000, 0x0000, 0x0000, > - 0x0000, 0x0000, 0x0000, 0x0006, > - 0x0001, 0x0000, 0x574d, 0x4c13, > -}; > +static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg) > +{ > + return snd_soc_read(codec, reg); > +} > +static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, > + unsigned int val) > +{ > + return snd_soc_write(codec, reg, val); > +} > > #define HPL_MIXER 0 > #define HPR_MIXER 1 > @@ -674,39 +657,97 @@ static const struct snd_soc_dapm_route wm9713_audio_map[] = { > {"Capture Mono Mux", "Right", "Right Capture Source"}, > }; > > -static unsigned int ac97_read(struct snd_soc_codec *codec, > - unsigned int reg) > +static bool wm9713_readable_reg(struct device *dev, unsigned int reg) > { > - struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); > - u16 *cache = codec->reg_cache; > - > - if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || > - reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 || > - reg == AC97_CD) > - return soc_ac97_ops->read(wm9713->ac97, reg); > - else { > - reg = reg >> 1; > - > - if (reg >= (ARRAY_SIZE(wm9713_reg))) > - return -EIO; > - > - return cache[reg]; > + switch (reg) { > + case AC97_RESET ... AC97_PCM_SURR_DAC_RATE: > + case AC97_PCM_LR_ADC_RATE: > + case AC97_CENTER_LFE_MASTER: > + case AC97_SPDIF ... AC97_LINE1_LEVEL: > + case AC97_GPIO_CFG ... 0x5c: > + case AC97_CODEC_CLASS_REV ... AC97_PCI_SID: > + case 0x74 ... AC97_VENDOR_ID2: > + return true; > + default: > + return false; > } > } > > -static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, > - unsigned int val) > +static bool wm9713_writeable_reg(struct device *dev, unsigned int reg) > { > - struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); > + switch (reg) { > + case AC97_VENDOR_ID1: > + case AC97_VENDOR_ID2: > + return false; > + default: > + return wm9713_readable_reg(dev, reg); > + } > +} > > - u16 *cache = codec->reg_cache; > - soc_ac97_ops->write(wm9713->ac97, reg, val); > - reg = reg >> 1; > - if (reg < (ARRAY_SIZE(wm9713_reg))) > - cache[reg] = val; > +static const struct reg_default wm9713_reg_defaults[] = { > + { 0x02, 0x8080 }, /* Speaker Output Volume */ > + { 0x04, 0x8080 }, /* Headphone Output Volume */ > + { 0x06, 0x8080 }, /* Out3/OUT4 Volume */ > + { 0x08, 0xc880 }, /* Mono Volume */ > + { 0x0a, 0xe808 }, /* LINEIN Volume */ > + { 0x0c, 0xe808 }, /* DAC PGA Volume */ > + { 0x0e, 0x0808 }, /* MIC PGA Volume */ > + { 0x10, 0x00da }, /* MIC Routing Control */ > + { 0x12, 0x8000 }, /* Record PGA Volume */ > + { 0x14, 0xd600 }, /* Record Routing */ > + { 0x16, 0xaaa0 }, /* PCBEEP Volume */ > + { 0x18, 0xaaa0 }, /* VxDAC Volume */ > + { 0x1a, 0xaaa0 }, /* AUXDAC Volume */ > + { 0x1c, 0x0000 }, /* Output PGA Mux */ > + { 0x1e, 0x0000 }, /* DAC 3D control */ > + { 0x20, 0x0f0f }, /* DAC Tone Control*/ > + { 0x22, 0x0040 }, /* MIC Input Select & Bias */ > + { 0x24, 0x0000 }, /* Output Volume Mapping & Jack */ > + { 0x26, 0x7f00 }, /* Powerdown Ctrl/Stat*/ > + { 0x28, 0x0405 }, /* Extended Audio ID */ > + { 0x2a, 0x0410 }, /* Extended Audio Start/Ctrl */ > + { 0x2c, 0xbb80 }, /* Audio DACs Sample Rate */ > + { 0x2e, 0xbb80 }, /* AUXDAC Sample Rate */ > + { 0x32, 0xbb80 }, /* Audio ADCs Sample Rate */ > + { 0x36, 0x4523 }, /* PCM codec control */ > + { 0x3a, 0x2000 }, /* SPDIF control */ > + { 0x3c, 0xfdff }, /* Powerdown 1 */ > + { 0x3e, 0xffff }, /* Powerdown 2 */ > + { 0x40, 0x0000 }, /* General Purpose */ > + { 0x42, 0x0000 }, /* Fast Power-Up Control */ > + { 0x44, 0x0080 }, /* MCLK/PLL Control */ > + { 0x46, 0x0000 }, /* MCLK/PLL Control */ > + { 0x4c, 0xfffe }, /* GPIO Pin Configuration */ > + { 0x4e, 0xffff }, /* GPIO Pin Polarity / Type */ > + { 0x50, 0x0000 }, /* GPIO Pin Sticky */ > + { 0x52, 0x0000 }, /* GPIO Pin Wake-Up */ > + /* GPIO Pin Status */ > + { 0x56, 0xfffe }, /* GPIO Pin Sharing */ > + { 0x58, 0x4000 }, /* GPIO PullUp/PullDown */ > + { 0x5a, 0x0000 }, /* Additional Functions 1 */ > + { 0x5c, 0x0000 }, /* Additional Functions 2 */ > + { 0x60, 0xb032 }, /* ALC Control */ > + { 0x62, 0x3e00 }, /* ALC / Noise Gate Control */ > + { 0x64, 0x0000 }, /* AUXDAC input control */ > + { 0x74, 0x0000 }, /* Digitiser Reg 1 */ > + { 0x76, 0x0006 }, /* Digitiser Reg 2 */ > + { 0x78, 0x0001 }, /* Digitiser Reg 3 */ > + { 0x7a, 0x0000 }, /* Digitiser Read Back */ > +}; > > - return 0; > -} > +static const struct regmap_config wm9713_regmap_config = { > + .reg_bits = 16, > + .reg_stride = 2, > + .val_bits = 16, > + .max_register = 0x7e, > + .cache_type = REGCACHE_RBTREE, > + > + .reg_defaults = wm9713_reg_defaults, > + .num_reg_defaults = ARRAY_SIZE(wm9713_reg_defaults), > + .volatile_reg = regmap_ac97_default_volatile, > + .readable_reg = wm9713_readable_reg, > + .writeable_reg = wm9713_writeable_reg, > +}; > > /* PLL divisors */ > struct _pll_div { > @@ -1158,6 +1199,9 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) > { > u16 reg; > > + snd_soc_cache_sync(codec); There doesn't seem to be much point in syncing the cache at the start of a suspend, in theory I would expect the cache to be in sync at this point anyway. I think you are thinking of this wrong, cache_sync does not ensure all previous writes have been commited, as I explained in my last email it literally writes the cache to the hardware, suspend usually turns the hardware off. So why write all the registers to the hardware just before turning it off. > + regcache_cache_bypass(codec->component.regmap, true); Why is the necessary? I can't see an obvious sign that these writes bypass the cache in the non-regmap version, am I missing something? Also if this is necessary I would quite like it to be accompanied by a comment in the code to explain why it is safe to do this here. Regarding the inherent dangers of cache bypass I explained in my last email. > + > /* Disable everything except touchpanel - that will be handled > * by the touch driver and left disabled if touch is not in > * use. */ > @@ -1173,14 +1217,14 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) I would have expected to see the cache being put into cache only mode at some point during suspend, am I missing something here as well? Again this feels like you are getting confused on the functionality of the API, bypassing the cache makes all reads/writes go to the hardware, suspend normally turns the hardware off. Directing all reads/writes to go to the hardware in a function that normally turns the hardware off looks odd. > static int wm9713_soc_resume(struct snd_soc_codec *codec) > { > struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); > - int i, ret; > - u16 *cache = codec->reg_cache; > + int ret; > > ret = snd_ac97_reset(wm9713->ac97, true, WM9713_VENDOR_ID, > WM9713_VENDOR_ID_MASK); > if (ret < 0) > return ret; > > + regcache_cache_bypass(codec->component.regmap, false); > snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); > > /* do we need to re-start the PLL ? */ > @@ -1188,14 +1232,10 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) > wm9713_set_pll(codec, 0, wm9713->pll_in, 0); > > /* only synchronise the codec if warm reset failed */ > - if (ret == 0) { > - for (i = 2; i < ARRAY_SIZE(wm9713_reg) << 1; i += 2) { > - if (i == AC97_POWERDOWN || i == AC97_EXTENDED_MID || > - i == AC97_EXTENDED_MSTATUS || i > 0x66) > - continue; > - soc_ac97_ops->write(wm9713->ac97, i, cache[i>>1]); > - } > - } > + if (ret == 0) > + regcache_mark_dirty(codec->component.regmap); > + > + snd_soc_cache_sync(codec); Probably best to have both the mark_dirty and the cache_sync in the if. Whilst the cache sync is a no-op if it hasn't been marked as dirty, will just be a bit clearer this is indentical to the pre-regmap code and more likely to remain that way under future changes. Thanks, Charles
Charles Keepax <ckeepax@opensource.wolfsonmicro.com> writes: >> @@ -1158,6 +1199,9 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) >> { >> u16 reg; >> >> + snd_soc_cache_sync(codec); > > There doesn't seem to be much point in syncing the cache at the > start of a suspend, in theory I would expect the cache to be in > sync at this point anyway. > I think you are thinking of this wrong, cache_sync does not > ensure all previous writes have been commited, as I explained > in my last email it literally writes the cache to the hardware, > suspend usually turns the hardware off. So why write all the > registers to the hardware just before turning it off. Indeed, I'll remove it. >> + regcache_cache_bypass(codec->component.regmap, true); > > Why is the necessary? I can't see an obvious sign that these > writes bypass the cache in the non-regmap version, am I missing > something? This is because to mimic the previous behavior, the next 4 writes (AC97_EXTENDED_MID, AC97_EXTENDED_MSTATUS, AC97_POWERDOWN * 2) should hit the hardware but not the cache (hence the bypass), but see below for the follow-up of my thinking. > Also if this is necessary I would quite like it to be > accompanied by a comment in the code to explain why it is safe to > do this here. Regarding the inherent dangers of cache bypass I > explained in my last email. Well, once suspended I supposed no access should be done before the resume function is called, hence the "safe" part. >> /* Disable everything except touchpanel - that will be handled >> * by the touch driver and left disabled if touch is not in >> * use. */ >> @@ -1173,14 +1217,14 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) > > I would have expected to see the cache being put into cache only > mode at some point during suspend, am I missing something here as > well? Why ? Once suspended, why would you expect an access to be done to the regmap ? What is the case this "cache only" protects us from ? > Again this feels like you are getting confused on the > functionality of the API, bypassing the cache makes all > reads/writes go to the hardware, suspend normally turns the > hardware off. Directing all reads/writes to go to the hardware in > a function that normally turns the hardware off looks odd. Yes, I must certainly misunderstand something. Once again I must understand first why you expect accesses to be done after a suspend function was called ... >> + if (ret == 0) >> + regcache_mark_dirty(codec->component.regmap); >> + >> + snd_soc_cache_sync(codec); > > Probably best to have both the mark_dirty and the cache_sync in > the if. Whilst the cache sync is a no-op if it hasn't been marked > as dirty, will just be a bit clearer this is indentical to the > pre-regmap code and more likely to remain that way under future > changes. I must admit I was expecting that the 4 registers I wrote directly to hardware in bypass mode were marked as "dirty", and this sync() would restore them ... Anyway, I have another idea to simplify the code greatly, it's only I'm not sure if my thinking is right. The idea is that these 3 registers (AC97_EXTENDED_MID, AC97_EXTENDED_MSTATUS, AC97_POWERDOWN) should never land in the regmap cache. What I think is that because they are in regmap_ac97_default_volatile(), they already have this property. Therefore, there is no need to do the bypass thing, and I could end up with : static int wm9713_soc_suspend(struct snd_soc_codec *codec) { /* Disable everything except touchpanel - that will be handled * by the touch driver and left disabled if touch is not in * use. */ snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0x7fff, 0x7fff); snd_soc_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); snd_soc_write(codec, AC97_POWERDOWN, 0x6f00); snd_soc_write(codec, AC97_POWERDOWN, 0xffff); /* * RJK: still need to be convinced why this is necessary for this * next line */ regcache_cache_only(codec->regmap, true); return 0; } static int wm9713_soc_resume(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); int ret; /* * RJK: still need to be convinced why this is necessary for this * next line */ regcache_cache_only(codec->regmap, false); ret = snd_ac97_reset(wm9713->ac97, true, WM9713_VENDOR_ID, WM9713_VENDOR_ID_MASK); if (ret < 0) return ret; snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); /* do we need to re-start the PLL ? */ if (wm9713->pll_in) wm9713_set_pll(codec, 0, wm9713->pll_in, 0); /* only synchronise the codec if warm reset failed */ if (ret == 0) { regcache_mark_dirty(codec->component.regmap); snd_soc_cache_sync(codec); } return ret; } Thanks for your reviews.
On Wed, Oct 28, 2015 at 12:43:51PM +0000, Charles Keepax wrote: > On Tue, Oct 27, 2015 at 10:58:21PM +0100, Robert Jarzmik wrote: Please delete unneeded context from mails when replying. Doing this makes it much easier to find your reply in the message, helping ensure it won't be missed by people scrolling through the irrelevant quoted material. > Why is the necessary? I can't see an obvious sign that these > writes bypass the cache in the non-regmap version, am I missing > something? Also if this is necessary I would quite like it to be > accompanied by a comment in the code to explain why it is safe to > do this here. Regarding the inherent dangers of cache bypass I > explained in my last email. It's probably worth pointing out that the functionality in the regmap API is essentially the same as the functionality in the old ASoC cache code, a conversion should pretty much be a case of directly translating API calls.
On Wed, Oct 28, 2015 at 09:34:33PM +0100, Robert Jarzmik wrote: > Charles Keepax <ckeepax@opensource.wolfsonmicro.com> writes: > >> /* Disable everything except touchpanel - that will be handled > >> * by the touch driver and left disabled if touch is not in > >> * use. */ > >> @@ -1173,14 +1217,14 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) > > > > I would have expected to see the cache being put into cache only > > mode at some point during suspend, am I missing something here as > > well? > Why ? Once suspended, why would you expect an access to be done to the regmap ? > What is the case this "cache only" protects us from ? Ah sorry this one is my bad, I was assuming these where the runtime suspend/resume a closer look shows these are the system suspend/resume. So yes it is pretty reasonable nothing will touch the registers. > > > Again this feels like you are getting confused on the > > functionality of the API, bypassing the cache makes all > > reads/writes go to the hardware, suspend normally turns the > > hardware off. Directing all reads/writes to go to the hardware in > > a function that normally turns the hardware off looks odd. > Yes, I must certainly misunderstand something. > Once again I must understand first why you expect accesses to be done after a > suspend function was called ... > > >> + if (ret == 0) > >> + regcache_mark_dirty(codec->component.regmap); > >> + > >> + snd_soc_cache_sync(codec); > > > > Probably best to have both the mark_dirty and the cache_sync in > > the if. Whilst the cache sync is a no-op if it hasn't been marked > > as dirty, will just be a bit clearer this is indentical to the > > pre-regmap code and more likely to remain that way under future > > changes. > I must admit I was expecting that the 4 registers I wrote directly to hardware > in bypass mode were marked as "dirty", and this sync() would restore them ... > > Anyway, I have another idea to simplify the code greatly, it's only I'm not sure > if my thinking is right. The idea is that these 3 registers (AC97_EXTENDED_MID, > AC97_EXTENDED_MSTATUS, AC97_POWERDOWN) should never land in the regmap > cache. What I think is that because they are in regmap_ac97_default_volatile(), > they already have this property. Therefore, there is no need to do the bypass > thing, and I could end up with : Ah ok yes these are all volatile registers in which cause they will bypass the naturally. > > static int wm9713_soc_suspend(struct snd_soc_codec *codec) > { > /* Disable everything except touchpanel - that will be handled > * by the touch driver and left disabled if touch is not in > * use. */ > snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0x7fff, > 0x7fff); > snd_soc_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); > snd_soc_write(codec, AC97_POWERDOWN, 0x6f00); > snd_soc_write(codec, AC97_POWERDOWN, 0xffff); > > /* > * RJK: still need to be convinced why this is necessary for this > * next line > */ > regcache_cache_only(codec->regmap, true); Yes you are correct you can just drop this line. > > return 0; > } > > static int wm9713_soc_resume(struct snd_soc_codec *codec) > { > struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); > int ret; > > /* > * RJK: still need to be convinced why this is necessary for this > * next line > */ > regcache_cache_only(codec->regmap, false); ditto. > > ret = snd_ac97_reset(wm9713->ac97, true, WM9713_VENDOR_ID, > WM9713_VENDOR_ID_MASK); > if (ret < 0) > return ret; > > snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); > > /* do we need to re-start the PLL ? */ > if (wm9713->pll_in) > wm9713_set_pll(codec, 0, wm9713->pll_in, 0); > > /* only synchronise the codec if warm reset failed */ > if (ret == 0) { > regcache_mark_dirty(codec->component.regmap); > snd_soc_cache_sync(codec); > } > > return ret; > } > > Thanks for your reviews. Yeah that solution looks a lot more like what I was expecting. Thanks, Charles
Charles Keepax <ckeepax@opensource.wolfsonmicro.com> writes:
> Yeah that solution looks a lot more like what I was expecting.
Okay, so I'm ready to fire the v4. I'll wait a couple of days for others reviews
and if none I'll send the v4.
Cheers.
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0c9733ecd17f..ba306f8f3717 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -879,6 +879,7 @@ config SND_SOC_WM9712 config SND_SOC_WM9713 tristate + select REGMAP_AC97 # Amp config SND_SOC_LM4857 diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 4083a5130cbd..8e2cc1112e40 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/ac97_codec.h> @@ -39,33 +40,15 @@ struct wm9713_priv { struct mutex lock; }; -static unsigned int ac97_read(struct snd_soc_codec *codec, - unsigned int reg); -static int ac97_write(struct snd_soc_codec *codec, - unsigned int reg, unsigned int val); - -/* - * WM9713 register cache - * Reg 0x3c bit 15 is used by touch driver. - */ -static const u16 wm9713_reg[] = { - 0x6174, 0x8080, 0x8080, 0x8080, - 0xc880, 0xe808, 0xe808, 0x0808, - 0x00da, 0x8000, 0xd600, 0xaaa0, - 0xaaa0, 0xaaa0, 0x0000, 0x0000, - 0x0f0f, 0x0040, 0x0000, 0x7f00, - 0x0405, 0x0410, 0xbb80, 0xbb80, - 0x0000, 0xbb80, 0x0000, 0x4523, - 0x0000, 0x2000, 0x7eff, 0xffff, - 0x0000, 0x0000, 0x0080, 0x0000, - 0x0000, 0x0000, 0xfffe, 0xffff, - 0x0000, 0x0000, 0x0000, 0xfffe, - 0x4000, 0x0000, 0x0000, 0x0000, - 0xb032, 0x3e00, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, - 0x0001, 0x0000, 0x574d, 0x4c13, -}; +static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg) +{ + return snd_soc_read(codec, reg); +} +static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, + unsigned int val) +{ + return snd_soc_write(codec, reg, val); +} #define HPL_MIXER 0 #define HPR_MIXER 1 @@ -674,39 +657,97 @@ static const struct snd_soc_dapm_route wm9713_audio_map[] = { {"Capture Mono Mux", "Right", "Right Capture Source"}, }; -static unsigned int ac97_read(struct snd_soc_codec *codec, - unsigned int reg) +static bool wm9713_readable_reg(struct device *dev, unsigned int reg) { - struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - u16 *cache = codec->reg_cache; - - if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || - reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 || - reg == AC97_CD) - return soc_ac97_ops->read(wm9713->ac97, reg); - else { - reg = reg >> 1; - - if (reg >= (ARRAY_SIZE(wm9713_reg))) - return -EIO; - - return cache[reg]; + switch (reg) { + case AC97_RESET ... AC97_PCM_SURR_DAC_RATE: + case AC97_PCM_LR_ADC_RATE: + case AC97_CENTER_LFE_MASTER: + case AC97_SPDIF ... AC97_LINE1_LEVEL: + case AC97_GPIO_CFG ... 0x5c: + case AC97_CODEC_CLASS_REV ... AC97_PCI_SID: + case 0x74 ... AC97_VENDOR_ID2: + return true; + default: + return false; } } -static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, - unsigned int val) +static bool wm9713_writeable_reg(struct device *dev, unsigned int reg) { - struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + switch (reg) { + case AC97_VENDOR_ID1: + case AC97_VENDOR_ID2: + return false; + default: + return wm9713_readable_reg(dev, reg); + } +} - u16 *cache = codec->reg_cache; - soc_ac97_ops->write(wm9713->ac97, reg, val); - reg = reg >> 1; - if (reg < (ARRAY_SIZE(wm9713_reg))) - cache[reg] = val; +static const struct reg_default wm9713_reg_defaults[] = { + { 0x02, 0x8080 }, /* Speaker Output Volume */ + { 0x04, 0x8080 }, /* Headphone Output Volume */ + { 0x06, 0x8080 }, /* Out3/OUT4 Volume */ + { 0x08, 0xc880 }, /* Mono Volume */ + { 0x0a, 0xe808 }, /* LINEIN Volume */ + { 0x0c, 0xe808 }, /* DAC PGA Volume */ + { 0x0e, 0x0808 }, /* MIC PGA Volume */ + { 0x10, 0x00da }, /* MIC Routing Control */ + { 0x12, 0x8000 }, /* Record PGA Volume */ + { 0x14, 0xd600 }, /* Record Routing */ + { 0x16, 0xaaa0 }, /* PCBEEP Volume */ + { 0x18, 0xaaa0 }, /* VxDAC Volume */ + { 0x1a, 0xaaa0 }, /* AUXDAC Volume */ + { 0x1c, 0x0000 }, /* Output PGA Mux */ + { 0x1e, 0x0000 }, /* DAC 3D control */ + { 0x20, 0x0f0f }, /* DAC Tone Control*/ + { 0x22, 0x0040 }, /* MIC Input Select & Bias */ + { 0x24, 0x0000 }, /* Output Volume Mapping & Jack */ + { 0x26, 0x7f00 }, /* Powerdown Ctrl/Stat*/ + { 0x28, 0x0405 }, /* Extended Audio ID */ + { 0x2a, 0x0410 }, /* Extended Audio Start/Ctrl */ + { 0x2c, 0xbb80 }, /* Audio DACs Sample Rate */ + { 0x2e, 0xbb80 }, /* AUXDAC Sample Rate */ + { 0x32, 0xbb80 }, /* Audio ADCs Sample Rate */ + { 0x36, 0x4523 }, /* PCM codec control */ + { 0x3a, 0x2000 }, /* SPDIF control */ + { 0x3c, 0xfdff }, /* Powerdown 1 */ + { 0x3e, 0xffff }, /* Powerdown 2 */ + { 0x40, 0x0000 }, /* General Purpose */ + { 0x42, 0x0000 }, /* Fast Power-Up Control */ + { 0x44, 0x0080 }, /* MCLK/PLL Control */ + { 0x46, 0x0000 }, /* MCLK/PLL Control */ + { 0x4c, 0xfffe }, /* GPIO Pin Configuration */ + { 0x4e, 0xffff }, /* GPIO Pin Polarity / Type */ + { 0x50, 0x0000 }, /* GPIO Pin Sticky */ + { 0x52, 0x0000 }, /* GPIO Pin Wake-Up */ + /* GPIO Pin Status */ + { 0x56, 0xfffe }, /* GPIO Pin Sharing */ + { 0x58, 0x4000 }, /* GPIO PullUp/PullDown */ + { 0x5a, 0x0000 }, /* Additional Functions 1 */ + { 0x5c, 0x0000 }, /* Additional Functions 2 */ + { 0x60, 0xb032 }, /* ALC Control */ + { 0x62, 0x3e00 }, /* ALC / Noise Gate Control */ + { 0x64, 0x0000 }, /* AUXDAC input control */ + { 0x74, 0x0000 }, /* Digitiser Reg 1 */ + { 0x76, 0x0006 }, /* Digitiser Reg 2 */ + { 0x78, 0x0001 }, /* Digitiser Reg 3 */ + { 0x7a, 0x0000 }, /* Digitiser Read Back */ +}; - return 0; -} +static const struct regmap_config wm9713_regmap_config = { + .reg_bits = 16, + .reg_stride = 2, + .val_bits = 16, + .max_register = 0x7e, + .cache_type = REGCACHE_RBTREE, + + .reg_defaults = wm9713_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm9713_reg_defaults), + .volatile_reg = regmap_ac97_default_volatile, + .readable_reg = wm9713_readable_reg, + .writeable_reg = wm9713_writeable_reg, +}; /* PLL divisors */ struct _pll_div { @@ -1158,6 +1199,9 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) { u16 reg; + snd_soc_cache_sync(codec); + regcache_cache_bypass(codec->component.regmap, true); + /* Disable everything except touchpanel - that will be handled * by the touch driver and left disabled if touch is not in * use. */ @@ -1173,14 +1217,14 @@ static int wm9713_soc_suspend(struct snd_soc_codec *codec) static int wm9713_soc_resume(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - int i, ret; - u16 *cache = codec->reg_cache; + int ret; ret = snd_ac97_reset(wm9713->ac97, true, WM9713_VENDOR_ID, WM9713_VENDOR_ID_MASK); if (ret < 0) return ret; + regcache_cache_bypass(codec->component.regmap, false); snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); /* do we need to re-start the PLL ? */ @@ -1188,14 +1232,10 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) wm9713_set_pll(codec, 0, wm9713->pll_in, 0); /* only synchronise the codec if warm reset failed */ - if (ret == 0) { - for (i = 2; i < ARRAY_SIZE(wm9713_reg) << 1; i += 2) { - if (i == AC97_POWERDOWN || i == AC97_EXTENDED_MID || - i == AC97_EXTENDED_MSTATUS || i > 0x66) - continue; - soc_ac97_ops->write(wm9713->ac97, i, cache[i>>1]); - } - } + if (ret == 0) + regcache_mark_dirty(codec->component.regmap); + + snd_soc_cache_sync(codec); return ret; } @@ -1203,6 +1243,7 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) static int wm9713_soc_probe(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + struct regmap *regmap; int reg; wm9713->ac97 = snd_soc_new_ac97_codec(codec, WM9713_VENDOR_ID, @@ -1210,6 +1251,14 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) if (IS_ERR(wm9713->ac97)) return PTR_ERR(wm9713->ac97); + regmap = devm_regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); + if (IS_ERR(regmap)) { + snd_soc_free_ac97_codec(wm9713->ac97); + return PTR_ERR(regmap); + } + + snd_soc_codec_init_regmap(codec, regmap); + /* unmute the adc - move to kcontrol */ reg = ac97_read(codec, AC97_CD) & 0x7fff; ac97_write(codec, AC97_CD, reg); @@ -1221,6 +1270,7 @@ static int wm9713_soc_remove(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + snd_soc_codec_exit_regmap(codec); snd_soc_free_ac97_codec(wm9713->ac97); return 0; } @@ -1230,13 +1280,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { .remove = wm9713_soc_remove, .suspend = wm9713_soc_suspend, .resume = wm9713_soc_resume, - .read = ac97_read, - .write = ac97_write, .set_bias_level = wm9713_set_bias_level, - .reg_cache_size = ARRAY_SIZE(wm9713_reg), - .reg_word_size = sizeof(u16), - .reg_cache_step = 2, - .reg_cache_default = wm9713_reg, .controls = wm9713_snd_ac97_controls, .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls),
Convert the Wolfson WM9713 to regmap API. This will leverage all the regmap functions (debug, registers update, etc ...). As a bonus, this will pave the path to gpio chip introduction, and devicetree support. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- Since v1: fix suspend/resume (that specific part is not tested yet) Since v2: split out the snd_soc_*() from regmap support --- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/wm9713.c | 182 ++++++++++++++++++++++++++++------------------ 2 files changed, 114 insertions(+), 69 deletions(-)