[2/5] mfd: axp20x: Add missing axp288 irqs
diff mbox

Message ID 20161214135209.16369-2-hdegoede@redhat.com
State Not Applicable
Headers show

Commit Message

Hans de Goede Dec. 14, 2016, 1:52 p.m. UTC
The axp288 has the following irqs 2 times: VBUS_FALL, VBUS_RISE,
VBUS_OV. On boot / reset the enable flags for both the normal and alt
version of these irqs is set.

Since we were only listing the normal version in the axp288 regmap_irq
struct, we were never disabling the alt versions of these irqs.

Add the alt versions to the axp288 regmap_irq struct, so that these
get properly disabled.

Together with the other axp288 fixes in this series, this fixes the axp288
irq contineously triggering.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/mfd/axp20x.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Chen-Yu Tsai Dec. 14, 2016, 2:21 p.m. UTC | #1
On Wed, Dec 14, 2016 at 9:52 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> The axp288 has the following irqs 2 times: VBUS_FALL, VBUS_RISE,
> VBUS_OV. On boot / reset the enable flags for both the normal and alt
> version of these irqs is set.
>
> Since we were only listing the normal version in the axp288 regmap_irq
> struct, we were never disabling the alt versions of these irqs.
>
> Add the alt versions to the axp288 regmap_irq struct, so that these
> get properly disabled.
>
> Together with the other axp288 fixes in this series, this fixes the axp288
> irq contineously triggering.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Chen-Yu Tsai <wens@csie.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lee Jones Jan. 3, 2017, 5:54 p.m. UTC | #2
On Wed, 14 Dec 2016, Hans de Goede wrote:

> The axp288 has the following irqs 2 times: VBUS_FALL, VBUS_RISE,
> VBUS_OV. On boot / reset the enable flags for both the normal and alt
> version of these irqs is set.
> 
> Since we were only listing the normal version in the axp288 regmap_irq
> struct, we were never disabling the alt versions of these irqs.
> 
> Add the alt versions to the axp288 regmap_irq struct, so that these
> get properly disabled.
> 
> Together with the other axp288 fixes in this series, this fixes the axp288
> irq contineously triggering.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/mfd/axp20x.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 3d76941..9a81659 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -405,6 +405,9 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
>  	INIT_REGMAP_IRQ(AXP288, VBUS_FALL,              0, 2),
>  	INIT_REGMAP_IRQ(AXP288, VBUS_RISE,              0, 3),
>  	INIT_REGMAP_IRQ(AXP288, OV,                     0, 4),
> +	INIT_REGMAP_IRQ(AXP288, FALLING_ALT,            0, 5),
> +	INIT_REGMAP_IRQ(AXP288, RISING_ALT,             0, 6),
> +	INIT_REGMAP_IRQ(AXP288, OV_ALT,                 0, 7),
>  
>  	INIT_REGMAP_IRQ(AXP288, DONE,                   1, 2),
>  	INIT_REGMAP_IRQ(AXP288, CHARGING,               1, 3),

Patch
diff mbox

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 3d76941..9a81659 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -405,6 +405,9 @@  static const struct regmap_irq axp288_regmap_irqs[] = {
 	INIT_REGMAP_IRQ(AXP288, VBUS_FALL,              0, 2),
 	INIT_REGMAP_IRQ(AXP288, VBUS_RISE,              0, 3),
 	INIT_REGMAP_IRQ(AXP288, OV,                     0, 4),
+	INIT_REGMAP_IRQ(AXP288, FALLING_ALT,            0, 5),
+	INIT_REGMAP_IRQ(AXP288, RISING_ALT,             0, 6),
+	INIT_REGMAP_IRQ(AXP288, OV_ALT,                 0, 7),
 
 	INIT_REGMAP_IRQ(AXP288, DONE,                   1, 2),
 	INIT_REGMAP_IRQ(AXP288, CHARGING,               1, 3),