Skip to contentSkip to conversation

mfd: Fixup clients of multi_reg_write/register_patch

PATCH RESEND Applied Charles Keepax 2 participants 2 messages Sep 18, 2015 – Sep 19, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 mfd: Fixup clients of multi_reg_write/register_patch

From: Nariman Poushin <[email protected]>

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")

---
 drivers/mfd/wm5110-tables.c |    2 +-
 drivers/mfd/wm8998-tables.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/wm5110-tables.c +1 -1
index 768f1ea..205fbd1 100644
@@ -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 },
drivers/mfd/wm8998-tables.c +1 -1
index e6de3cd..607640c 100644
@@ -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 },
Signature · 1 line
1.7.2.5
Applied
#1 lore raw
Quoted 10 lines · Charles Keepax

From: Nariman Poushin <[email protected]>

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")

Quoted 7 lines
---
 drivers/mfd/wm5110-tables.c |    2 +-
 drivers/mfd/wm8998-tables.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Quoted 26 lines
drivers/mfd/wm5110-tables.c +1 -1
index 768f1ea..205fbd1 100644
@@ -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 },
drivers/mfd/wm8998-tables.c +1 -1
index e6de3cd..607640c 100644
@@ -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 },
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog