2015-07-17 09:59:51

by Steve Twiss

Subject: [PATCH V1] da9063: mfd: Fix missing DA9063_M_DVC_RDY mask bit

From: Steve Twiss <[email protected]>

Fix a missing DVC_RDY interrupt mask in struct regmap_irq definition.

The original submission of this driver did not contain all interrupt
masking definitions in the struct regmap_irq contained in the file
da9063-irq.c

The solution is to add a DA9063_IRQ_DVC_RDY entry to enum da9063_irqs
list and to add the corresponding values to compensate for the missing
mask bit in the static const struct regmap_irq da9063_irqs[] table.

Signed-off-by: Steve Twiss <[email protected]>
Signed-off-by: Adam Ward <[email protected]>

---
This patch applies against linux-next and v4.2-rc2


drivers/mfd/da9063-irq.c | 4 ++++
include/linux/mfd/da9063/core.h | 1 +
2 files changed, 5 insertions(+)

diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
index eaf1ec9..2630263 100644
--- a/drivers/mfd/da9063-irq.c
+++ b/drivers/mfd/da9063-irq.c
@@ -77,6 +77,10 @@ static const struct regmap_irq da9063_irqs[] = {
.reg_offset = DA9063_REG_EVENT_B_OFFSET,
.mask = DA9063_M_UVOV,
},
+ [DA9063_IRQ_DVC_RDY] = {
+ .reg_offset = DA9063_REG_EVENT_B_OFFSET,
+ .mask = DA9063_M_DVC_RDY,
+ },
[DA9063_IRQ_VDD_MON] = {
.reg_offset = DA9063_REG_EVENT_B_OFFSET,
.mask = DA9063_M_VDD_MON,
diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
index 79f4d82..621af82 100644
--- a/include/linux/mfd/da9063/core.h
+++ b/include/linux/mfd/da9063/core.h
@@ -51,6 +51,7 @@ enum da9063_irqs {
DA9063_IRQ_COMP_1V2,
DA9063_IRQ_LDO_LIM,
DA9063_IRQ_REG_UVOV,
+ DA9063_IRQ_DVC_RDY,
DA9063_IRQ_VDD_MON,
DA9063_IRQ_WARN,
DA9063_IRQ_GPI0,
--
end-of-patch for PATCH V1

2015-07-23 13:44:29

by Lee Jones

Subject: Re: [PATCH V1] da9063: mfd: Fix missing DA9063_M_DVC_RDY mask bit

On Fri, 17 Jul 2015, Steve Twiss wrote:

> From: Steve Twiss <[email protected]>
>
> Fix a missing DVC_RDY interrupt mask in struct regmap_irq definition.
>
> The original submission of this driver did not contain all interrupt
> masking definitions in the struct regmap_irq contained in the file
> da9063-irq.c
>
> The solution is to add a DA9063_IRQ_DVC_RDY entry to enum da9063_irqs
> list and to add the corresponding values to compensate for the missing
> mask bit in the static const struct regmap_irq da9063_irqs[] table.
>
> Signed-off-by: Steve Twiss <[email protected]>
> Signed-off-by: Adam Ward <[email protected]>
>
> ---
> This patch applies against linux-next and v4.2-rc2
>
>
> drivers/mfd/da9063-irq.c | 4 ++++
> include/linux/mfd/da9063/core.h | 1 +
> 2 files changed, 5 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
> index eaf1ec9..2630263 100644
> --- a/drivers/mfd/da9063-irq.c
> +++ b/drivers/mfd/da9063-irq.c
> @@ -77,6 +77,10 @@ static const struct regmap_irq da9063_irqs[] = {
> .reg_offset = DA9063_REG_EVENT_B_OFFSET,
> .mask = DA9063_M_UVOV,
> },
> + [DA9063_IRQ_DVC_RDY] = {
> + .reg_offset = DA9063_REG_EVENT_B_OFFSET,
> + .mask = DA9063_M_DVC_RDY,
> + },
> [DA9063_IRQ_VDD_MON] = {
> .reg_offset = DA9063_REG_EVENT_B_OFFSET,
> .mask = DA9063_M_VDD_MON,
> diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
> index 79f4d82..621af82 100644
> --- a/include/linux/mfd/da9063/core.h
> +++ b/include/linux/mfd/da9063/core.h
> @@ -51,6 +51,7 @@ enum da9063_irqs {
> DA9063_IRQ_COMP_1V2,
> DA9063_IRQ_LDO_LIM,
> DA9063_IRQ_REG_UVOV,
> + DA9063_IRQ_DVC_RDY,
> DA9063_IRQ_VDD_MON,
> DA9063_IRQ_WARN,
> DA9063_IRQ_GPI0,

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