aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx31_3ds.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-06-13 03:58:08 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-07-01 09:58:08 -0400
commited4a7fb01a467f5d264fe12f17eb981f21c7bbcd (patch)
tree5c7e553d820e844391df0c23c4238d6f046bb5e4 /arch/arm/mach-imx/mach-mx31_3ds.c
parent1595f16c5e537cb33e118e7ae18dff139f22bdb1 (diff)
ARM: imx: pass gpio than irq number into mxc_expio_init
Change mxc_expio_init interface a little bit to have gpio than irq number passed in. With the change, gpio_to_irq can be called inside mxc_expio_init to get irq number, so that MXC_IRQ_TO_GPIO can be removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31_3ds.c')
-rw-r--r--arch/arm/mach-imx/mach-mx31_3ds.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 618935e1e32..f37d9b5774a 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -730,8 +730,7 @@ static void __init mx31_3ds_init(void)
730 if (!otg_mode_host) 730 if (!otg_mode_host)
731 imx31_add_fsl_usb2_udc(&usbotg_pdata); 731 imx31_add_fsl_usb2_udc(&usbotg_pdata);
732 732
733 if (mxc_expio_init(MX31_CS5_BASE_ADDR, 733 if (mxc_expio_init(MX31_CS5_BASE_ADDR, IOMUX_TO_GPIO(MX31_PIN_GPIO1_1)))
734 gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1))))
735 printk(KERN_WARNING "Init of the debug board failed, all " 734 printk(KERN_WARNING "Init of the debug board failed, all "
736 "devices on the debug board are unusable.\n"); 735 "devices on the debug board are unusable.\n");
737 imx31_add_imx2_wdt(NULL); 736 imx31_add_imx2_wdt(NULL);