public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH RESEND] mfd: Fixup clients of multi_reg_write/register_patch
@ 2015-09-18 11:55 Charles Keepax
  2015-09-19 10:08 ` Lee Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Charles Keepax @ 2015-09-18 11:55 UTC (permalink / raw)
  To: lee.jones; +Cc: sameo, patches, linux-kernel, sfr, geert, broonie

From: Nariman Poushin <nariman@opensource.wolfsonmicro.com>

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>
---
 drivers/mfd/wm5110-tables.c |    2 +-
 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 768f1ea..205fbd1 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[] = {
 };
 
 /* 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 },
diff --git a/drivers/mfd/wm8998-tables.c b/drivers/mfd/wm8998-tables.c
index e6de3cd..607640c 100644
--- a/drivers/mfd/wm8998-tables.c
+++ b/drivers/mfd/wm8998-tables.c
@@ -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 },
-- 
1.7.2.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH RESEND] mfd: Fixup clients of multi_reg_write/register_patch
  2015-09-18 11:55 [PATCH RESEND] mfd: Fixup clients of multi_reg_write/register_patch Charles Keepax
@ 2015-09-19 10:08 ` Lee Jones
  0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2015-09-19 10:08 UTC (permalink / raw)
  To: Charles Keepax; +Cc: sameo, patches, linux-kernel, sfr, geert, broonie

On Fri, 18 Sep 2015, Charles Keepax wrote:

> From: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
> 
> 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>
> ---
>  drivers/mfd/wm5110-tables.c |    2 +-
>  drivers/mfd/wm8998-tables.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
> index 768f1ea..205fbd1 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[] = {
>  };
>  
>  /* 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 },
> diff --git a/drivers/mfd/wm8998-tables.c b/drivers/mfd/wm8998-tables.c
> index e6de3cd..607640c 100644
> --- a/drivers/mfd/wm8998-tables.c
> +++ b/drivers/mfd/wm8998-tables.c
> @@ -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 },

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-09-19 10:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 11:55 [PATCH RESEND] mfd: Fixup clients of multi_reg_write/register_patch Charles Keepax
2015-09-19 10:08 ` Lee Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox