diff options
author | Paulius Zaleckas <paulius.zaleckas@teltonika.lt> | 2008-11-14 05:01:38 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-12-16 08:58:40 -0500 |
commit | cfca8b539f53114fb6a6de091987a984c8013d96 (patch) | |
tree | 7ba5516e465164bb330f1e8965f1be91337f966a /arch/arm/plat-mxc/gpio.c | |
parent | d133d6a89340b7438038ed0407221c5277cb8a0e (diff) |
patch-mxc-add-ARCH_MX1
Adds MX1 architecture to platform MXC. It will supersede mach-imx
and let it die.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/gpio.c')
-rw-r--r-- | arch/arm/plat-mxc/gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index de5c4747453f..ccbd94adc668 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/arch/arm/plat-mxc/gpio.c | |||
@@ -115,8 +115,8 @@ static void mxc_gpio_irq_handler(struct mxc_gpio_port *port, u32 irq_stat) | |||
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | #ifdef CONFIG_ARCH_MX3 | 118 | #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX1) |
119 | /* MX3 has one interrupt *per* gpio port */ | 119 | /* MX1 and MX3 has one interrupt *per* gpio port */ |
120 | static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) | 120 | static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) |
121 | { | 121 | { |
122 | u32 irq_stat; | 122 | u32 irq_stat; |
@@ -237,7 +237,7 @@ int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt) | |||
237 | /* its a serious configuration bug when it fails */ | 237 | /* its a serious configuration bug when it fails */ |
238 | BUG_ON( gpiochip_add(&port[i].chip) < 0 ); | 238 | BUG_ON( gpiochip_add(&port[i].chip) < 0 ); |
239 | 239 | ||
240 | #ifdef CONFIG_ARCH_MX3 | 240 | #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX1) |
241 | /* setup one handler for each entry */ | 241 | /* setup one handler for each entry */ |
242 | set_irq_chained_handler(port[i].irq, mx3_gpio_irq_handler); | 242 | set_irq_chained_handler(port[i].irq, mx3_gpio_irq_handler); |
243 | set_irq_data(port[i].irq, &port[i]); | 243 | set_irq_data(port[i].irq, &port[i]); |