summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp4xx/common.c
diff options
context:
space:
mode:
authorAlessandro Zummo <a.zummo@towertech.it>2006-03-20 17:10:12 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-21 22:06:09 +0000
commit73deb7dc05b4cf968e506e7b18345bc65bcbc0f3 (patch)
tree82c657f89548aaa0d6e62e889e0dafef427fd8d8 /arch/arm/mach-ixp4xx/common.c
parent03bd14c4b7fa535c78f17751172dbe8937729f05 (diff)
[ARM] 3368/1: ixp4xx: set gpio direction in ixp4xx_config_irq
Patch from Alessandro Zummo ixp4xx_config_irq did not configure the gpio line as an input. As an added bonus, the irq2gpio array has been converted from int to char. Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
-rw-r--r--arch/arm/mach-ixp4xx/common.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index fbadf3021b9e..a0888e160e3b 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -91,7 +91,7 @@ static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type);
/*
* IRQ -> GPIO mapping table
*/
-static int irq2gpio[32] = {
+static char irq2gpio[32] = {
-1, -1, -1, -1, -1, -1, 0, 1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 2, 3, 4, 5, 6,
@@ -153,6 +153,9 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
/* Set the new style */
*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
+ /* Configure the line as an input */
+ gpio_line_config(line, IXP4XX_GPIO_IN);
+
return 0;
}