| Message ID | 1445309232-24094-3-git-send-email-jiada_wang@mentor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 20, 2015 at 11:47:12AM +0900, Jiada Wang wrote: > As ALC2 register is volatile, declare it as one of ALC Coefficients > register together with other non-volatile registers will cause issue, > in case wm8962 has enter suspend mode, and cache_only flag is set, > any attempt to read from ALC2 will fail. > > Instead of declaring one ALC Coefficients register which contains > ALC1 ~ ALC3 and Noise Gate, this patch declares 4 separate registers, > so that regmap can handle these registers differently based on their > classification. > > Signed-off-by: Jiada Wang <jiada_wang@mentor.com> > --- > sound/soc/codecs/wm8962.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c > index a3d7778..157530c 100644 > --- a/sound/soc/codecs/wm8962.c > +++ b/sound/soc/codecs/wm8962.c > @@ -1782,8 +1782,11 @@ SND_SOC_BYTES("HD Bass Coefficients", WM8962_HDBASS_AI_1, 30), > > SOC_DOUBLE("ALC Switch", WM8962_ALC1, WM8962_ALCL_ENA_SHIFT, > WM8962_ALCR_ENA_SHIFT, 1, 0), > -SND_SOC_BYTES_MASK("ALC Coefficients", WM8962_ALC1, 4, > +SND_SOC_BYTES_MASK("ALC1", WM8962_ALC1, 1, > WM8962_ALCL_ENA_MASK | WM8962_ALCR_ENA_MASK), > +SND_SOC_BYTES("ALC2", WM8962_ALC2, 1), > +SND_SOC_BYTES("ALC3", WM8962_ALC3, 1), > +SND_SOC_BYTES("Noise Gate", WM8962_NOISE_GATE, 1), This doesn't really seem ideal to be changing the interface at this point in the drivers life. Looking through the datasheet/driver there are 5 status bits in the ALC2 register but we don't use them anywhere in the driver and they don't look like they are likely to be useful to the end user. I wonder if an easier solution might just be to have the register be non-volatile? Thanks, Charles
On Tue, Oct 20, 2015 at 11:47:12AM +0900, Jiada Wang wrote: > As ALC2 register is volatile, declare it as one of ALC Coefficients > register together with other non-volatile registers will cause issue, > in case wm8962 has enter suspend mode, and cache_only flag is set, > any attempt to read from ALC2 will fail. > > Instead of declaring one ALC Coefficients register which contains > ALC1 ~ ALC3 and Noise Gate, this patch declares 4 separate registers, > so that regmap can handle these registers differently based on their > classification. In addition to the issue with the ABI change that Charles raised this also doesn't entirely fix the issue in that we still have a control that is going to give an error in suspend mode. Charles' suggestion seems like it's more likely to be helpful to users.
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index a3d7778..157530c 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1782,8 +1782,11 @@ SND_SOC_BYTES("HD Bass Coefficients", WM8962_HDBASS_AI_1, 30), SOC_DOUBLE("ALC Switch", WM8962_ALC1, WM8962_ALCL_ENA_SHIFT, WM8962_ALCR_ENA_SHIFT, 1, 0), -SND_SOC_BYTES_MASK("ALC Coefficients", WM8962_ALC1, 4, +SND_SOC_BYTES_MASK("ALC1", WM8962_ALC1, 1, WM8962_ALCL_ENA_MASK | WM8962_ALCR_ENA_MASK), +SND_SOC_BYTES("ALC2", WM8962_ALC2, 1), +SND_SOC_BYTES("ALC3", WM8962_ALC3, 1), +SND_SOC_BYTES("Noise Gate", WM8962_NOISE_GATE, 1), }; static const struct snd_kcontrol_new wm8962_spk_mono_controls[] = {
As ALC2 register is volatile, declare it as one of ALC Coefficients register together with other non-volatile registers will cause issue, in case wm8962 has enter suspend mode, and cache_only flag is set, any attempt to read from ALC2 will fail. Instead of declaring one ALC Coefficients register which contains ALC1 ~ ALC3 and Noise Gate, this patch declares 4 separate registers, so that regmap can handle these registers differently based on their classification. Signed-off-by: Jiada Wang <jiada_wang@mentor.com> --- sound/soc/codecs/wm8962.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)