On Fri, 18 Sep 2015, Charles Keepax wrote:
> 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")
>
> Signed-off-by: Nariman Poushin <[email protected]>
> Acked-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Charles Keepax <[email protected]>
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
