Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b023666e6c0165651de18cabcbb65ba14f2db153

Authored by Fabio Estevam
Committed by Mark Brown
1 parent f36e8edb95

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 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>
Link: https://lore.kernel.org/r/20200803115233.19034-1-festevam@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

sound/soc/codecs/wm8962.c
Diff comments   View file @ b023666
... ... @@ -151,7 +151,6 @@
151 151 { 40, 0x0000 }, /* R40 - SPKOUTL volume */
152 152 { 41, 0x0000 }, /* R41 - SPKOUTR volume */
153 153  
154   - { 48, 0x0000 }, /* R48 - Additional control(4) */
155 154 { 49, 0x0010 }, /* R49 - Class D Control 1 */
156 155 { 51, 0x0003 }, /* R51 - Class D Control 2 */
157 156  
... ... @@ -842,6 +841,7 @@
842 841 case WM8962_SPKOUTL_VOLUME:
843 842 case WM8962_SPKOUTR_VOLUME:
844 843 case WM8962_THERMAL_SHUTDOWN_STATUS:
  844 + case WM8962_ADDITIONAL_CONTROL_4:
845 845 case WM8962_CLASS_D_CONTROL_1:
846 846 case WM8962_CLASS_D_CONTROL_2:
847 847 case WM8962_CLOCKING_4: