Skip to content

Commit b023666

Browse files
fabioestevambroonie
authored andcommitted
ASoC: wm8962: Do not remove ADDITIONAL_CONTROL_4 from readable register list
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 658bb29 ("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: 658bb29 ("ASoC: wm8962: Do not access WM8962_GPIO_BASE") Reported-by: Shengjiu Wang <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent f36e8ed commit b023666

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sound/soc/codecs/wm8962.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ static const struct reg_default wm8962_reg[] = {
151151
{ 40, 0x0000 }, /* R40 - SPKOUTL volume */
152152
{ 41, 0x0000 }, /* R41 - SPKOUTR volume */
153153

154-
{ 48, 0x0000 }, /* R48 - Additional control(4) */
155154
{ 49, 0x0010 }, /* R49 - Class D Control 1 */
156155
{ 51, 0x0003 }, /* R51 - Class D Control 2 */
157156

@@ -842,6 +841,7 @@ static bool wm8962_readable_register(struct device *dev, unsigned int reg)
842841
case WM8962_SPKOUTL_VOLUME:
843842
case WM8962_SPKOUTR_VOLUME:
844843
case WM8962_THERMAL_SHUTDOWN_STATUS:
844+
case WM8962_ADDITIONAL_CONTROL_4:
845845
case WM8962_CLASS_D_CONTROL_1:
846846
case WM8962_CLASS_D_CONTROL_2:
847847
case WM8962_CLOCKING_4:

0 commit comments

Comments
 (0)