* [PATCH] mfd: wm8997: Mark INTERRUPT_STATUS_2_MASK as readable
@ 2014-11-04 15:26 Charles Keepax
2014-11-10 15:25 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Charles Keepax @ 2014-11-04 15:26 UTC (permalink / raw)
To: lee.jones; +Cc: sameo, patches, linux-kernel
Technically this register is not used on wm8997 however the regmap core
requires a continuous block of IRQs. The simplest solution is just to
add the register.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/wm8997-tables.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
index 06c3093..c0c25d7 100644
--- a/drivers/mfd/wm8997-tables.c
+++ b/drivers/mfd/wm8997-tables.c
@@ -670,6 +670,7 @@ static const struct reg_default wm8997_reg_default[] = {
{ 0x00000C23, 0x0000 }, /* R3107 - Misc Pad Ctrl 4 */
{ 0x00000C24, 0x0000 }, /* R3108 - Misc Pad Ctrl 5 */
{ 0x00000D08, 0xFFFF }, /* R3336 - Interrupt Status 1 Mask */
+ { 0x00000D09, 0xFFFF }, /* R3337 - Interrupt Status 2 Mask */
{ 0x00000D0A, 0xFFFF }, /* R3338 - Interrupt Status 3 Mask */
{ 0x00000D0B, 0xFFFF }, /* R3339 - Interrupt Status 4 Mask */
{ 0x00000D0C, 0xFEFF }, /* R3340 - Interrupt Status 5 Mask */
@@ -1330,6 +1331,7 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
case ARIZONA_INTERRUPT_STATUS_4:
case ARIZONA_INTERRUPT_STATUS_5:
case ARIZONA_INTERRUPT_STATUS_1_MASK:
+ case ARIZONA_INTERRUPT_STATUS_2_MASK:
case ARIZONA_INTERRUPT_STATUS_3_MASK:
case ARIZONA_INTERRUPT_STATUS_4_MASK:
case ARIZONA_INTERRUPT_STATUS_5_MASK:
--
1.7.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mfd: wm8997: Mark INTERRUPT_STATUS_2_MASK as readable
2014-11-04 15:26 [PATCH] mfd: wm8997: Mark INTERRUPT_STATUS_2_MASK as readable Charles Keepax
@ 2014-11-10 15:25 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2014-11-10 15:25 UTC (permalink / raw)
To: Charles Keepax; +Cc: sameo, patches, linux-kernel
On Tue, 04 Nov 2014, Charles Keepax wrote:
> Technically this register is not used on wm8997 however the regmap core
> requires a continuous block of IRQs. The simplest solution is just to
> add the register.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm8997-tables.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
> index 06c3093..c0c25d7 100644
> --- a/drivers/mfd/wm8997-tables.c
> +++ b/drivers/mfd/wm8997-tables.c
> @@ -670,6 +670,7 @@ static const struct reg_default wm8997_reg_default[] = {
> { 0x00000C23, 0x0000 }, /* R3107 - Misc Pad Ctrl 4 */
> { 0x00000C24, 0x0000 }, /* R3108 - Misc Pad Ctrl 5 */
> { 0x00000D08, 0xFFFF }, /* R3336 - Interrupt Status 1 Mask */
> + { 0x00000D09, 0xFFFF }, /* R3337 - Interrupt Status 2 Mask */
> { 0x00000D0A, 0xFFFF }, /* R3338 - Interrupt Status 3 Mask */
> { 0x00000D0B, 0xFFFF }, /* R3339 - Interrupt Status 4 Mask */
> { 0x00000D0C, 0xFEFF }, /* R3340 - Interrupt Status 5 Mask */
> @@ -1330,6 +1331,7 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
> case ARIZONA_INTERRUPT_STATUS_4:
> case ARIZONA_INTERRUPT_STATUS_5:
> case ARIZONA_INTERRUPT_STATUS_1_MASK:
> + case ARIZONA_INTERRUPT_STATUS_2_MASK:
> case ARIZONA_INTERRUPT_STATUS_3_MASK:
> case ARIZONA_INTERRUPT_STATUS_4_MASK:
> case ARIZONA_INTERRUPT_STATUS_5_MASK:
--
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:[~2014-11-10 15:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-04 15:26 [PATCH] mfd: wm8997: Mark INTERRUPT_STATUS_2_MASK as readable Charles Keepax
2014-11-10 15:25 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox