mfd: arizona: Correct addresses of always-on trigger registers

Update the addresses and names to match current silicon.
The WM8997 regmap tables have been adjusted to match the new
names.
Missing registers have been added to WM5110 default value table.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 070f8cfbbd7aa7c5f7d043178948fda4cea852b8..ada3286c68e9400bd1dbd42995d639531964fa6b 100644 (file)
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -1037,6 +1037,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8:
        case ARIZONA_COMFORT_NOISE_GENERATOR:
        case ARIZONA_HAPTICS_CONTROL_1:
        case ARIZONA_HAPTICS_CONTROL_2:

diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 58bc2be6e6a55472bc1b050fe04668cef2d4c1b4..41a7f6fb7802778fab41aeab37ff6147d400fb2c 100644 (file)
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -468,10 +468,12 @@ static const struct reg_default wm5110_reg_default[] = {
        { 0x00000062, 0x01FF },    /* R98    - Sample Rate Sequence Select 2 */
        { 0x00000063, 0x01FF },    /* R99    - Sample Rate Sequence Select 3 */
        { 0x00000064, 0x01FF },    /* R100   - Sample Rate Sequence Select 4 */
-       { 0x00000068, 0x01FF },    /* R104   - Always On Triggers Sequence Select 1 */
-       { 0x00000069, 0x01FF },    /* R105   - Always On Triggers Sequence Select 2 */
-       { 0x0000006A, 0x01FF },    /* R106   - Always On Triggers Sequence Select 3 */
-       { 0x0000006B, 0x01FF },    /* R107   - Always On Triggers Sequence Select 4 */
+       { 0x00000066, 0x01FF },    /* R102   - Always On Triggers Sequence Select 1 */
+       { 0x00000067, 0x01FF },    /* R103   - Always On Triggers Sequence Select 2 */
+       { 0x00000068, 0x01FF },    /* R104   - Always On Triggers Sequence Select 3 */
+       { 0x00000069, 0x01FF },    /* R105   - Always On Triggers Sequence Select 4 */
+       { 0x0000006A, 0x01FF },    /* R106   - Always On Triggers Sequence Select 5 */
+       { 0x0000006B, 0x01FF },    /* R107   - Always On Triggers Sequence Select 6 */
        { 0x00000070, 0x0000 },    /* R112   - Comfort Noise Generator */
        { 0x00000090, 0x0000 },    /* R144   - Haptics Control 1 */
        { 0x00000091, 0x7FFF },    /* R145   - Haptics Control 2 */
@@ -1499,6 +1501,8 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
        case ARIZONA_COMFORT_NOISE_GENERATOR:
        case ARIZONA_HAPTICS_CONTROL_1:
        case ARIZONA_HAPTICS_CONTROL_2:

diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
index c9c65197bb69d3a0739d0c6806fba57aafd2e81f..c7a81da64ee1d57f441d40f7fa84a52dceb154e9 100644 (file)
--- a/drivers/mfd/wm8997-tables.c
+++ b/drivers/mfd/wm8997-tables.c
@@ -174,10 +174,10 @@ static const struct reg_default wm8997_reg_default[] = {
        { 0x00000062, 0x01FF },    /* R98    - Sample Rate Sequence Select 2 */
        { 0x00000063, 0x01FF },    /* R99    - Sample Rate Sequence Select 3 */
        { 0x00000064, 0x01FF },    /* R100   - Sample Rate Sequence Select 4 */
-       { 0x00000068, 0x01FF },    /* R104   - Always On Triggers Sequence Select 1 */
-       { 0x00000069, 0x01FF },    /* R105   - Always On Triggers Sequence Select 2 */
-       { 0x0000006A, 0x01FF },    /* R106   - Always On Triggers Sequence Select 3 */
-       { 0x0000006B, 0x01FF },    /* R107   - Always On Triggers Sequence Select 4 */
+       { 0x00000068, 0x01FF },    /* R104   - Always On Triggers Sequence Select 3 */
+       { 0x00000069, 0x01FF },    /* R105   - Always On Triggers Sequence Select 4 */
+       { 0x0000006A, 0x01FF },    /* R106   - Always On Triggers Sequence Select 5 */
+       { 0x0000006B, 0x01FF },    /* R107   - Always On Triggers Sequence Select 6 */
        { 0x00000070, 0x0000 },    /* R112   - Comfort Noise Generator */
        { 0x00000090, 0x0000 },    /* R144   - Haptics Control 1 */
        { 0x00000091, 0x7FFF },    /* R145   - Haptics Control 2 */
@@ -814,10 +814,10 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2:
        case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3:
        case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_4:
-       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1:
-       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
        case ARIZONA_COMFORT_NOISE_GENERATOR:
        case ARIZONA_HAPTICS_CONTROL_1:
        case ARIZONA_HAPTICS_CONTROL_2:

diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 7b35c21170d5938e86eda0d4541057bca0ede81b..7204d8138b246b81ffbd5635facbe0e88a93ad40 100644 (file)
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -42,12 +42,14 @@
 #define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2    0x62
 #define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3    0x63
 #define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_4    0x64
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1 0x68
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2 0x69
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3 0x6A
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4 0x6B
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5 0x6C
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6 0x6D
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1 0x66
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2 0x67
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3 0x68
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4 0x69
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5 0x6A
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6 0x6B
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7 0x6C
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8 0x6D
 #define ARIZONA_COMFORT_NOISE_GENERATOR          0x70
 #define ARIZONA_HAPTICS_CONTROL_1                0x90
 #define ARIZONA_HAPTICS_CONTROL_2                0x91