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

Commit 99c47707 authored by Imre Deak's avatar Imre Deak Committed by Tony Lindgren
Browse files

ARM: OMAP: Fix GPIO IRQ mask handling 



The GPIO IRQ mask was retrieved incorrectly in cases where we have a mask
register instead of an enable register. Also we should only return the
valid bits depending on the bank size.

This fixes a bug on 1510/1610 based OMAPs where GPIO IRQs are not
delivered.

Signed-off-by: default avatarImre Deak <imre.deak@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent eca9e56e

arch/arm/plat-omap/gpio.c

+16 −1
Original line number Diff line number Diff line
@@ -540,29 +540,44 @@ static inline void _clear_gpio_irqstatus(struct gpio_bank *bank, int gpio) 
static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)

{

	void __iomem *reg = bank->base;

	int inv = 0;

	u32 l;

	u32 mask;



	switch (bank->method) {

	case METHOD_MPUIO:

		reg += OMAP_MPUIO_GPIO_MASKIT;

		mask = 0xffff;

		inv = 1;

		break;

	case METHOD_GPIO_1510:

		reg += OMAP1510_GPIO_INT_MASK;

		mask = 0xffff;

		inv = 1;

		break;

	case METHOD_GPIO_1610:

		reg += OMAP1610_GPIO_IRQENABLE1;

		mask = 0xffff;

		break;

	case METHOD_GPIO_730:

		reg += OMAP730_GPIO_INT_MASK;

		mask = 0xffffffff;

		inv = 1;

		break;

	case METHOD_GPIO_24XX:

		reg += OMAP24XX_GPIO_IRQENABLE1;

		mask = 0xffffffff;

		break;

	default:

		BUG();

		return 0;

	}



	return __raw_readl(reg);

	l = __raw_readl(reg);

	if (inv)

		l = ~l;

	l &= mask;

	return l;

}



static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enable)