mfd: Fixup clients of multi_reg_write/register_patch
authorNariman Poushin <nariman@opensource.wolfsonmicro.com>
Fri, 18 Sep 2015 11:55:58 +0000 (12:55 +0100)
committerLee Jones <lee.jones@linaro.org>
Mon, 26 Oct 2015 14:48:58 +0000 (14:48 +0000)
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>
drivers/mfd/wm5110-tables.c
drivers/mfd/wm8998-tables.c

index 28f2ae3..46cad32 100644 (file)
@@ -250,7 +250,7 @@ static const struct reg_sequence wm5110_revd_patch[] = {
 };
 
 /* Add extra headphone write sequence locations */
-static const struct reg_default wm5110_reve_patch[] = {
+static const struct reg_sequence wm5110_reve_patch[] = {
        { 0x80, 0x3 },
        { 0x80, 0x3 },
        { 0x4b, 0x138 },
index e6de3cd..607640c 100644 (file)
@@ -21,7 +21,7 @@
 #define WM8998_NUM_AOD_ISR 2
 #define WM8998_NUM_ISR 5
 
-static const struct reg_default wm8998_rev_a_patch[] = {
+static const struct reg_sequence wm8998_rev_a_patch[] = {
        { 0x0212, 0x0000 },
        { 0x0211, 0x0014 },
        { 0x04E4, 0x0E0D },