Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 881ebd22 authored by Kuppuswamy Sathyanarayanan's avatar Kuppuswamy Sathyanarayanan Committed by Linus Walleij
Browse files

gpio: gpio-wcove: fix GPIO IRQ status mask 



According to Whiskey Cove PMIC spec, bit 7 of GPIOIRQ0_REG belongs to
battery IO. So we should skip this bit when checking for GPIO IRQ pending
status. Otherwise, wcove_gpio_irq_handler() might go into the infinite
loop until IRQ "pending" status becomes 0. This patch fixes this issue.

Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fa2f60ff

drivers/gpio/gpio-wcove.c

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#define GROUP1_NR_IRQS		6

#define IRQ_MASK_BASE		0x4e19

#define IRQ_STATUS_BASE		0x4e0b

#define GPIO_IRQ0_MASK		GENMASK(6, 0)

#define GPIO_IRQ1_MASK		GENMASK(5, 0)

#define UPDATE_IRQ_TYPE		BIT(0)

#define UPDATE_IRQ_MASK		BIT(1)
@@ -309,7 +311,7 @@ static irqreturn_t wcove_gpio_irq_handler(int irq, void *data) 
		return IRQ_NONE;

	}



	pending = p[0] | (p[1] << 8);

	pending = (p[0] & GPIO_IRQ0_MASK) | ((p[1] & GPIO_IRQ1_MASK) << 7);

	if (!pending)

		return IRQ_NONE;
@@ -333,7 +335,7 @@ static irqreturn_t wcove_gpio_irq_handler(int irq, void *data) 
			break;

		}



		pending = p[0] | (p[1] << 8);

		pending = (p[0] & GPIO_IRQ0_MASK) | ((p[1] & GPIO_IRQ1_MASK) << 7);

	}



	return IRQ_HANDLED;