aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <ukleinek@informatik.uni-freiburg.de>2007-09-30 15:36:14 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-10-12 18:43:39 -0400
commitc54ecb2481d464d50520ce60cf36011b68d1e89a (patch)
treedcb114640d6df63248e908062570a474fb5be13c
parentc0bb87f7b8a145b56d45484713e1b1f37ce7e626 (diff)
[ARM] 4594/1: ns9xxx: use the new gpio functions
Up to now only board-a9m9750dev.c used GPIOs. It just wrote directly into the corresponding registers. Now it properly reserves the gpio and uses the API function to configure it. Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-ns9xxx/board-a9m9750dev.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
index 88d1f7ef78c9..7fa3fb1f08ef 100644
--- a/arch/arm/mach-ns9xxx/board-a9m9750dev.c
+++ b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
@@ -13,6 +13,7 @@
13#include <linux/irq.h> 13#include <linux/irq.h>
14 14
15#include <asm/mach/map.h> 15#include <asm/mach/map.h>
16#include <asm/gpio.h>
16 17
17#include <asm/arch-ns9xxx/board.h> 18#include <asm/arch-ns9xxx/board.h>
18#include <asm/arch-ns9xxx/regs-sys.h> 19#include <asm/arch-ns9xxx/regs-sys.h>
@@ -91,12 +92,11 @@ void __init board_a9m9750dev_init_irq(void)
91 u32 reg; 92 u32 reg;
92 int i; 93 int i;
93 94
94 /* 95 if (gpio_request(11, "board a9m9750dev extirq2") == 0)
95 * configure gpio for IRQ_EXT2 96 ns9xxx_gpio_configure(11, 0, 1);
96 * use GPIO 11, because GPIO 32 is used for the LCD 97 else
97 */ 98 printk(KERN_ERR "%s: cannot get gpio 11 for IRQ_EXT2\n",
98 /* XXX: proper GPIO handling */ 99 __func__);
99 BBU_GCONFb1(1) &= ~0x2000;
100 100
101 for (i = FPGA_IRQ(0); i <= FPGA_IRQ(7); ++i) { 101 for (i = FPGA_IRQ(0); i <= FPGA_IRQ(7); ++i) {
102 set_irq_chip(i, &a9m9750dev_fpga_chip); 102 set_irq_chip(i, &a9m9750dev_fpga_chip);