summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx1.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-02-17 14:43:48 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 19:29:37 +0100
commit5ae30b477e9fb7319e2976fbf3521c0fac2625f1 (patch)
treee9c943a384e61b4552175e35a981bdf2316baba2 /arch/arm/mach-imx/mm-imx1.c
parentMX1: Add structure, registration functions for framebuffer and rename LCDC INT (diff)
downloadlinux-5ae30b477e9fb7319e2976fbf3521c0fac2625f1.tar.xz
linux-5ae30b477e9fb7319e2976fbf3521c0fac2625f1.zip
ARM i.MX: Move gpio initialization to SoC specific files
This saves us from soc level dispatching in generic files Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx1.c')
-rw-r--r--arch/arm/mach-imx/mm-imx1.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c
index 378c61b1e74c..8613e440e48c 100644
--- a/arch/arm/mach-imx/mm-imx1.c
+++ b/arch/arm/mach-imx/mm-imx1.c
@@ -23,6 +23,8 @@
#include <mach/common.h>
#include <mach/hardware.h>
+#include <mach/gpio.h>
+#include <mach/irqs.h>
static struct map_desc imx_io_desc[] __initdata = {
imx_map_entry(MX1, IO, MT_DEVICE),
@@ -39,10 +41,15 @@ void __init imx1_init_early(void)
mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
}
-int imx1_register_gpios(void);
+static struct mxc_gpio_port imx1_gpio_ports[] = {
+ DEFINE_IMX_GPIO_PORT_IRQ(MX1, 0, 1, MX1_GPIO_INT_PORTA),
+ DEFINE_IMX_GPIO_PORT_IRQ(MX1, 1, 2, MX1_GPIO_INT_PORTB),
+ DEFINE_IMX_GPIO_PORT_IRQ(MX1, 2, 3, MX1_GPIO_INT_PORTC),
+ DEFINE_IMX_GPIO_PORT_IRQ(MX1, 3, 4, MX1_GPIO_INT_PORTD),
+};
void __init mx1_init_irq(void)
{
mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR));
- imx1_register_gpios();
+ mxc_gpio_init(imx1_gpio_ports, ARRAY_SIZE(imx1_gpio_ports));
}