1 files changed, 43 insertions, 4 deletions

diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 3113e39b318e..bf8b3b5ad1fe 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -243,6 +243,12 @@ int wm5110_patch(struct arizona *arizona)
 EXPORT_SYMBOL_GPL(wm5110_patch);
 
 static const struct regmap_irq wm5110_aod_irqs[ARIZONA_NUM_IRQ] = {
+        [ARIZONA_IRQ_MICD_CLAMP_FALL] = {
+                .mask = ARIZONA_MICD_CLAMP_FALL_EINT1
+        },
+        [ARIZONA_IRQ_MICD_CLAMP_RISE] = {
+                .mask = ARIZONA_MICD_CLAMP_RISE_EINT1
+        },
         [ARIZONA_IRQ_GP5_FALL] = { .mask = ARIZONA_GP5_FALL_EINT1 },
         [ARIZONA_IRQ_GP5_RISE] = { .mask = ARIZONA_GP5_RISE_EINT1 },
         [ARIZONA_IRQ_JD_FALL] = { .mask = ARIZONA_JD1_FALL_EINT1 },
@@ -505,6 +511,7 @@ static const struct reg_default wm5110_reg_default[] = {
         { 0x00000293, 0x0000 },    /* R659   - Accessory Detect Mode 1 */
         { 0x0000029B, 0x0020 },    /* R667   - Headphone Detect 1 */
         { 0x0000029C, 0x0000 },    /* R668   - Headphone Detect 2 */
+        { 0x000002A2, 0x0000 },    /* R674   - Micd clamp control */
         { 0x000002A3, 0x1102 },    /* R675   - Mic Detect 1 */
         { 0x000002A4, 0x009F },    /* R676   - Mic Detect 2 */
         { 0x000002A5, 0x0000 },    /* R677   - Mic Detect 3 */
@@ -592,7 +599,7 @@ static const struct reg_default wm5110_reg_default[] = {
         { 0x0000043E, 0x0080 },    /* R1086  - DAC Volume Limit 6R */
         { 0x0000043F, 0x0800 },    /* R1087  - Noise Gate Select 6R */
         { 0x00000450, 0x0000 },    /* R1104  - DAC AEC Control 1 */
-        { 0x00000458, 0x0001 },    /* R1112  - Noise Gate Control */
+        { 0x00000458, 0x0000 },    /* R1112  - Noise Gate Control */
         { 0x00000480, 0x0040 },    /* R1152  - Class W ANC Threshold 1 */
         { 0x00000481, 0x0040 },    /* R1153  - Class W ANC Threshold 2 */
         { 0x00000490, 0x0069 },    /* R1168  - PDM SPK1 CTRL 1 */
@@ -1204,7 +1211,6 @@ static const struct reg_default wm5110_reg_default[] = {
         { 0x00000D1B, 0xFFFF },    /* R3355  - IRQ2 Status 4 Mask */
         { 0x00000D1C, 0xFFFF },    /* R3356  - IRQ2 Status 5 Mask */
         { 0x00000D1F, 0x0000 },    /* R3359  - IRQ2 Control */
-        { 0x00000D50, 0x0000 },    /* R3408  - AOD wkup and trig */
         { 0x00000D53, 0xFFFF },    /* R3411  - AOD IRQ Mask IRQ1 */
         { 0x00000D54, 0xFFFF },    /* R3412  - AOD IRQ Mask IRQ2 */
         { 0x00000D56, 0x0000 },    /* R3414  - Jack detect debounce */
@@ -1440,6 +1446,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
         case ARIZONA_ACCESSORY_DETECT_MODE_1:
         case ARIZONA_HEADPHONE_DETECT_1:
         case ARIZONA_HEADPHONE_DETECT_2:
+        case ARIZONA_MICD_CLAMP_CONTROL:
         case ARIZONA_MIC_DETECT_1:
         case ARIZONA_MIC_DETECT_2:
         case ARIZONA_MIC_DETECT_3:
@@ -2291,21 +2298,37 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
         case ARIZONA_DSP1_STATUS_1:
         case ARIZONA_DSP1_STATUS_2:
         case ARIZONA_DSP1_STATUS_3:
+        case ARIZONA_DSP1_SCRATCH_0:
+        case ARIZONA_DSP1_SCRATCH_1:
+        case ARIZONA_DSP1_SCRATCH_2:
+        case ARIZONA_DSP1_SCRATCH_3:
         case ARIZONA_DSP2_CONTROL_1:
         case ARIZONA_DSP2_CLOCKING_1:
         case ARIZONA_DSP2_STATUS_1:
         case ARIZONA_DSP2_STATUS_2:
         case ARIZONA_DSP2_STATUS_3:
+        case ARIZONA_DSP2_SCRATCH_0:
+        case ARIZONA_DSP2_SCRATCH_1:
+        case ARIZONA_DSP2_SCRATCH_2:
+        case ARIZONA_DSP2_SCRATCH_3:
         case ARIZONA_DSP3_CONTROL_1:
         case ARIZONA_DSP3_CLOCKING_1:
         case ARIZONA_DSP3_STATUS_1:
         case ARIZONA_DSP3_STATUS_2:
         case ARIZONA_DSP3_STATUS_3:
+        case ARIZONA_DSP3_SCRATCH_0:
+        case ARIZONA_DSP3_SCRATCH_1:
+        case ARIZONA_DSP3_SCRATCH_2:
+        case ARIZONA_DSP3_SCRATCH_3:
         case ARIZONA_DSP4_CONTROL_1:
         case ARIZONA_DSP4_CLOCKING_1:
         case ARIZONA_DSP4_STATUS_1:
         case ARIZONA_DSP4_STATUS_2:
         case ARIZONA_DSP4_STATUS_3:
+        case ARIZONA_DSP4_SCRATCH_0:
+        case ARIZONA_DSP4_SCRATCH_1:
+        case ARIZONA_DSP4_SCRATCH_2:
+        case ARIZONA_DSP4_SCRATCH_3:
                 return true;
         default:
                 return false;
@@ -2347,25 +2370,41 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
         case ARIZONA_INTERRUPT_RAW_STATUS_7:
         case ARIZONA_INTERRUPT_RAW_STATUS_8:
         case ARIZONA_IRQ_PIN_STATUS:
+        case ARIZONA_AOD_WKUP_AND_TRIG:
         case ARIZONA_AOD_IRQ1:
         case ARIZONA_AOD_IRQ2:
+        case ARIZONA_AOD_IRQ_RAW_STATUS:
         case ARIZONA_FX_CTRL2:
         case ARIZONA_ASRC_STATUS:
         case ARIZONA_DSP_STATUS:
-        case ARIZONA_DSP1_CONTROL_1:
-        case ARIZONA_DSP1_CLOCKING_1:
         case ARIZONA_DSP1_STATUS_1:
         case ARIZONA_DSP1_STATUS_2:
         case ARIZONA_DSP1_STATUS_3:
+        case ARIZONA_DSP1_SCRATCH_0:
+        case ARIZONA_DSP1_SCRATCH_1:
+        case ARIZONA_DSP1_SCRATCH_2:
+        case ARIZONA_DSP1_SCRATCH_3:
         case ARIZONA_DSP2_STATUS_1:
         case ARIZONA_DSP2_STATUS_2:
         case ARIZONA_DSP2_STATUS_3:
+        case ARIZONA_DSP2_SCRATCH_0:
+        case ARIZONA_DSP2_SCRATCH_1:
+        case ARIZONA_DSP2_SCRATCH_2:
+        case ARIZONA_DSP2_SCRATCH_3:
         case ARIZONA_DSP3_STATUS_1:
         case ARIZONA_DSP3_STATUS_2:
         case ARIZONA_DSP3_STATUS_3:
+        case ARIZONA_DSP3_SCRATCH_0:
+        case ARIZONA_DSP3_SCRATCH_1:
+        case ARIZONA_DSP3_SCRATCH_2:
+        case ARIZONA_DSP3_SCRATCH_3:
         case ARIZONA_DSP4_STATUS_1:
         case ARIZONA_DSP4_STATUS_2:
         case ARIZONA_DSP4_STATUS_3:
+        case ARIZONA_DSP4_SCRATCH_0:
+        case ARIZONA_DSP4_SCRATCH_1:
+        case ARIZONA_DSP4_SCRATCH_2:
+        case ARIZONA_DSP4_SCRATCH_3:
                 return true;
         default:
                 return false;