mfd: arizona: Update registers for WM5110 DSP

DSPx_CONTROL_1 and DSPx_CLOCKING_1 are not volatile registers and are
incorrectly marked as such, fix this. Also add the DSP scratch
registers, which are frequently used to output debug info from the DSP
core.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

1 files changed, 32 insertions, 2 deletions

diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 3113e39b318e..a8a9bb972cfe 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -2291,21 +2291,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;
@@ -2352,20 +2368,34 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
         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;