diff options
author | Nariman Poushin <nariman@opensource.wolfsonmicro.com> | 2015-09-18 07:55:58 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2015-10-26 10:48:58 -0400 |
commit | c6d005ad7989803a2e30f95c81e71575c86543a1 (patch) | |
tree | 5a8c4a6cdc67b659a9f119edd92478797364a1ae | |
parent | f6d10341390d5d5bda1122dc5365e34d78f672ee (diff) |
mfd: Fixup clients of multi_reg_write/register_patch
Introduced by:
commit 8019ff6cfc04 ("regmap: Use reg_sequence for multi_reg_write / register_patch")
Interacting with:
commit 561629755a21 ("mfd: arizona: Add support for WM8998 and WM1814")
commit 81207880cef2 ("mfd: wm5110: Add register patch for rev E and above")
Signed-off-by: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/wm5110-tables.c | 2 | ||||
-rw-r--r-- | drivers/mfd/wm8998-tables.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c index 28f2ae30507a..46cad3280114 100644 --- a/drivers/mfd/wm5110-tables.c +++ b/drivers/mfd/wm5110-tables.c | |||
@@ -250,7 +250,7 @@ static const struct reg_sequence wm5110_revd_patch[] = { | |||
250 | }; | 250 | }; |
251 | 251 | ||
252 | /* Add extra headphone write sequence locations */ | 252 | /* Add extra headphone write sequence locations */ |
253 | static const struct reg_default wm5110_reve_patch[] = { | 253 | static const struct reg_sequence wm5110_reve_patch[] = { |
254 | { 0x80, 0x3 }, | 254 | { 0x80, 0x3 }, |
255 | { 0x80, 0x3 }, | 255 | { 0x80, 0x3 }, |
256 | { 0x4b, 0x138 }, | 256 | { 0x4b, 0x138 }, |
diff --git a/drivers/mfd/wm8998-tables.c b/drivers/mfd/wm8998-tables.c index e6de3cd8a9aa..607640c9c80f 100644 --- a/drivers/mfd/wm8998-tables.c +++ b/drivers/mfd/wm8998-tables.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #define WM8998_NUM_AOD_ISR 2 | 21 | #define WM8998_NUM_AOD_ISR 2 |
22 | #define WM8998_NUM_ISR 5 | 22 | #define WM8998_NUM_ISR 5 |
23 | 23 | ||
24 | static const struct reg_default wm8998_rev_a_patch[] = { | 24 | static const struct reg_sequence wm8998_rev_a_patch[] = { |
25 | { 0x0212, 0x0000 }, | 25 | { 0x0212, 0x0000 }, |
26 | { 0x0211, 0x0014 }, | 26 | { 0x0211, 0x0014 }, |
27 | { 0x04E4, 0x0E0D }, | 27 | { 0x04E4, 0x0E0D }, |