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

Commit 06e4479b authored by Mrten Wikstrm's avatar Mrten Wikstrm Committed by Russell King
Browse files

[ARM] 3347/1: Bugfix for ixp4xx_set_irq_type() 



Patch from Mrten Wikstrm

This patch fixes a bug in ixp4xx_set_irq_type() which leads to
GPIO being incorrectly set to both edge triggered for raising
as well as falling edge interrupt types. See the previous
discussion on patch 3312/1.

Signed-off-by: default avatarMrten Wikstrm <marten.wikstrom@passito.se>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent df666b9c

arch/arm/mach-ixp4xx/common.c

+13 −7
Original line number Diff line number Diff line
@@ -111,24 +111,30 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type) 
	if (line < 0)

		return -EINVAL;



	if (type & IRQT_BOTHEDGE) {

	switch (type){

	case IRQT_BOTHEDGE:

		int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL;

		irq_type = IXP4XX_IRQ_EDGE;

	} else  if (type & IRQT_RISING) {

		break;

	case IRQT_RISING:

		int_style = IXP4XX_GPIO_STYLE_RISING_EDGE;

		irq_type = IXP4XX_IRQ_EDGE;

	} else if (type & IRQT_FALLING) {

		break;

	case IRQT_FALLING:

		int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE;

		irq_type = IXP4XX_IRQ_EDGE;

	} else if (type & IRQT_HIGH) {

		break;

	case IRQT_HIGH:

		int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;

		irq_type = IXP4XX_IRQ_LEVEL;

	} else if (type & IRQT_LOW) {

		break;

	case IRQT_LOW:

		int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;

		irq_type = IXP4XX_IRQ_LEVEL;

	} else

		break;

	default:

		return -EINVAL;



	}

	ixp4xx_config_irq(irq, irq_type);



	if (line >= 8) {	/* pins 8-15 */