aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 09:40:30 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-12-09 09:40:52 -0500
commitbe2f6f5a7833b99bdee97c4b877dcd2afc6cdd00 (patch)
treee62a8b4018ecdd2488d900ddc325bf18e886b80b
parentb7dea5dc5baf6021f1d007db774569ad04741af9 (diff)
mfd: wm5102: Add readback of DSP status 3 register
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/wm5102-tables.c2
-rw-r--r--include/linux/mfd/arizona/registers.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 005de63d01d6..8844b2f9de87 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -2336,6 +2336,7 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
2336 case ARIZONA_DSP1_CLOCKING_1: 2336 case ARIZONA_DSP1_CLOCKING_1:
2337 case ARIZONA_DSP1_STATUS_1: 2337 case ARIZONA_DSP1_STATUS_1:
2338 case ARIZONA_DSP1_STATUS_2: 2338 case ARIZONA_DSP1_STATUS_2:
2339 case ARIZONA_DSP1_STATUS_3:
2339 return true; 2340 return true;
2340 default: 2341 default:
2341 return false; 2342 return false;
@@ -2386,6 +2387,7 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
2386 case ARIZONA_AOD_IRQ_RAW_STATUS: 2387 case ARIZONA_AOD_IRQ_RAW_STATUS:
2387 case ARIZONA_DSP1_STATUS_1: 2388 case ARIZONA_DSP1_STATUS_1:
2388 case ARIZONA_DSP1_STATUS_2: 2389 case ARIZONA_DSP1_STATUS_2:
2390 case ARIZONA_DSP1_STATUS_3:
2389 case ARIZONA_HEADPHONE_DETECT_2: 2391 case ARIZONA_HEADPHONE_DETECT_2:
2390 case ARIZONA_MIC_DETECT_3: 2392 case ARIZONA_MIC_DETECT_3:
2391 return true; 2393 return true;
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 7671a287dfee..81bca23c9a92 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -979,6 +979,7 @@
979#define ARIZONA_DSP1_CLOCKING_1 0x1101 979#define ARIZONA_DSP1_CLOCKING_1 0x1101
980#define ARIZONA_DSP1_STATUS_1 0x1104 980#define ARIZONA_DSP1_STATUS_1 0x1104
981#define ARIZONA_DSP1_STATUS_2 0x1105 981#define ARIZONA_DSP1_STATUS_2 0x1105
982#define ARIZONA_DSP1_STATUS_3 0x1106
982#define ARIZONA_DSP2_CONTROL_1 0x1200 983#define ARIZONA_DSP2_CONTROL_1 0x1200
983#define ARIZONA_DSP2_CLOCKING_1 0x1201 984#define ARIZONA_DSP2_CLOCKING_1 0x1201
984#define ARIZONA_DSP2_STATUS_1 0x1204 985#define ARIZONA_DSP2_STATUS_1 0x1204