summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorKatsunaga Kinoshita <katsu@katsu-ubuntu.(none)>2012-06-06 16:12:17 +0900
committerJustin Waters <justin.waters@timesys.com>2012-07-03 17:15:07 -0400
commit233b48907dd52d62282770c691201b3b4cc78d47 (patch)
tree9ddf94eee07c280c87234d4a3afe6518cdd21655 /arch/arm
parent1e123c5d6c82065501b9417524af4ab56ebc0019 (diff)
update: update serial and gpio inlitalize.
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvf/devices.c2
-rw-r--r--arch/arm/plat-mxc/mvf_gpio.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mvf/devices.c b/arch/arm/mach-mvf/devices.c
index 0984259b10bc..731b6a8e120c 100644
--- a/arch/arm/mach-mvf/devices.c
+++ b/arch/arm/mach-mvf/devices.c
@@ -81,5 +81,5 @@ static struct mvf_gpio_port mvf_gpio_ports[] = {
int mvf_register_gpios(void)
{
/* 5 ports for MVF */
- return mvf_gpio_init(mvf_gpio_ports, 7);
+ return mvf_gpio_init(mvf_gpio_ports, 5);
}
diff --git a/arch/arm/plat-mxc/mvf_gpio.c b/arch/arm/plat-mxc/mvf_gpio.c
index 161653f87e3e..8722ac38304d 100644
--- a/arch/arm/plat-mxc/mvf_gpio.c
+++ b/arch/arm/plat-mxc/mvf_gpio.c
@@ -166,6 +166,7 @@ static void gpio_mask_irq(struct irq_data *d)
static void gpio_unmask_irq(struct irq_data *d)
{
u32 gpio = irq_to_gpio(d->irq);
+ printk("gpio = %d\n",gpio);
_set_gpio_irqenable(&mvf_gpio_ports[gpio / 32], gpio & 0x1f, 1);
}