| Message ID | 1589347835-20554-1-git-send-email-shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 65e412a01bc0161175a962abd5a7fef6a62d5c8e |
| Headers | show |
| Series | ASoC: wm8962: Use force clear for WM8962_SYSCLK_ENA after reset | expand |
On Wed, May 13, 2020 at 01:30:35PM +0800, Shengjiu Wang wrote: > When CLOCKING2 is non-volatile register, we need force clear > the WM8962_SYSCLK_ENA bit after reset, for the value in cache > maybe 0 but in hardware it is 1. Otherwise there will issue > as below statement in driver. > > /* SYSCLK defaults to on; make sure it is off so we can safely > * write to registers if the device is declocked. > > Fixes: c38b608504aa ("ASoC: wm8962: set CLOCKING2 as non-volatile register") > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > --- Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
On Wed, 13 May 2020 13:30:35 +0800, Shengjiu Wang wrote: > When CLOCKING2 is non-volatile register, we need force clear > the WM8962_SYSCLK_ENA bit after reset, for the value in cache > maybe 0 but in hardware it is 1. Otherwise there will issue > as below statement in driver. > > /* SYSCLK defaults to on; make sure it is off so we can safely > * write to registers if the device is declocked. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.7 Thanks! [1/1] ASoC: wm8962: Use force clear for WM8962_SYSCLK_ENA after reset commit: 65e412a01bc0161175a962abd5a7fef6a62d5c8e All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 0a2cfff44441..08d19df8a700 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3798,8 +3798,8 @@ static int wm8962_runtime_resume(struct device *dev) /* SYSCLK defaults to on; make sure it is off so we can safely * write to registers if the device is declocked. */ - regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2, - WM8962_SYSCLK_ENA, 0); + regmap_write_bits(wm8962->regmap, WM8962_CLOCKING2, + WM8962_SYSCLK_ENA, 0); /* Ensure we have soft control over all registers */ regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
When CLOCKING2 is non-volatile register, we need force clear the WM8962_SYSCLK_ENA bit after reset, for the value in cache maybe 0 but in hardware it is 1. Otherwise there will issue as below statement in driver. /* SYSCLK defaults to on; make sure it is off so we can safely * write to registers if the device is declocked. Fixes: c38b608504aa ("ASoC: wm8962: set CLOCKING2 as non-volatile register") Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- sound/soc/codecs/wm8962.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)