| Message ID | 20200803115233.19034-1-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b023666e6c0165651de18cabcbb65ba14f2db153 |
| Headers | show |
| Series | ASoC: wm8962: Do not remove ADDITIONAL_CONTROL_4 from readable register list | expand |
On Mon, Aug 03, 2020 at 08:52:33AM -0300, Fabio Estevam wrote: > This change was sent as a comment below the --- line when submitting > commit 658bb297e393 ("ASoC: wm8962: Do not access WM8962_GPIO_BASE"), so > it was not supposed to get merged. That doesn't work with the tools - obviously the actual patch is also below the --- line and the patch format allows for arbatrary comments around patch blocks so as far as software is concerned this is just part of the patch.
On Mon, 3 Aug 2020 08:52:33 -0300, Fabio Estevam wrote: > Removing ADDITIONAL_CONTROL_4 from the list of readable registers cause > audio distortion. > > This change was sent as a comment below the --- line when submitting > commit 658bb297e393 ("ASoC: wm8962: Do not access WM8962_GPIO_BASE"), so > it was not supposed to get merged. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: wm8962: Do not remove ADDITIONAL_CONTROL_4 from readable register list commit: b023666e6c0165651de18cabcbb65ba14f2db153 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 317916cb4e27..0623a2251084 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -151,7 +151,6 @@ static const struct reg_default wm8962_reg[] = { { 40, 0x0000 }, /* R40 - SPKOUTL volume */ { 41, 0x0000 }, /* R41 - SPKOUTR volume */ - { 48, 0x0000 }, /* R48 - Additional control(4) */ { 49, 0x0010 }, /* R49 - Class D Control 1 */ { 51, 0x0003 }, /* R51 - Class D Control 2 */ @@ -842,6 +841,7 @@ static bool wm8962_readable_register(struct device *dev, unsigned int reg) case WM8962_SPKOUTL_VOLUME: case WM8962_SPKOUTR_VOLUME: case WM8962_THERMAL_SHUTDOWN_STATUS: + case WM8962_ADDITIONAL_CONTROL_4: case WM8962_CLASS_D_CONTROL_1: case WM8962_CLASS_D_CONTROL_2: case WM8962_CLOCKING_4:
Removing ADDITIONAL_CONTROL_4 from the list of readable registers cause audio distortion. This change was sent as a comment below the --- line when submitting commit 658bb297e393 ("ASoC: wm8962: Do not access WM8962_GPIO_BASE"), so it was not supposed to get merged. Keep WM8962_ADDITIONAL_CONTROL_4 inside wm8962_readable_register() to fix the regression. Fixes: 658bb297e393 ("ASoC: wm8962: Do not access WM8962_GPIO_BASE") Reported-by: Shengjiu Wang <shengjiu.wang@gmail.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> --- sound/soc/codecs/wm8962.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)