Merge remote-tracking branches 'asoc/topic/wm8962', 'asoc/topic/wm8974' and 'asoc...

[linux] / sound / soc / codecs / wm8962.c

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index a7e7978..949f632 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -131,7 +131,7 @@ static const struct reg_default wm8962_reg[] = {
        { 15, 0x6243 },   /* R15    - Software Reset */
 
        { 17, 0x007B },   /* R17    - ALC1 */
-
+       { 18, 0x0000 },   /* R18    - ALC2 */
        { 19, 0x1C32 },   /* R19    - ALC3 */
        { 20, 0x3200 },   /* R20    - Noise Gate */
        { 21, 0x00C0 },   /* R21    - Left ADC volume */
@@ -794,7 +794,6 @@ static bool wm8962_volatile_register(struct device *dev, unsigned int reg)
        case WM8962_CLOCKING1:
        case WM8962_CLOCKING2:
        case WM8962_SOFTWARE_RESET:
-       case WM8962_ALC2:
        case WM8962_THERMAL_SHUTDOWN_STATUS:
        case WM8962_ADDITIONAL_CONTROL_4:
        case WM8962_DC_SERVO_6: