diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-06-13 03:58:08 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-07-01 09:58:08 -0400 |
commit | ed4a7fb01a467f5d264fe12f17eb981f21c7bbcd (patch) | |
tree | 5c7e553d820e844391df0c23c4238d6f046bb5e4 /arch/arm/mach-imx/mach-mx35_3ds.c | |
parent | 1595f16c5e537cb33e118e7ae18dff139f22bdb1 (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-mx35_3ds.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx35_3ds.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index ad63e6ebee6d..596f237c0d0e 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c | |||
@@ -132,8 +132,6 @@ static struct platform_device mx35_3ds_lcd = { | |||
132 | .dev.platform_data = &mx35_3ds_lcd_data, | 132 | .dev.platform_data = &mx35_3ds_lcd_data, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | #define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(1, 1)) | ||
136 | |||
137 | static const struct imxuart_platform_data uart_pdata __initconst = { | 135 | static const struct imxuart_platform_data uart_pdata __initconst = { |
138 | .flags = IMXUART_HAVE_RTSCTS, | 136 | .flags = IMXUART_HAVE_RTSCTS, |
139 | }; | 137 | }; |
@@ -580,7 +578,7 @@ static void __init mx35_3ds_init(void) | |||
580 | imx35_add_mxc_nand(&mx35pdk_nand_board_info); | 578 | imx35_add_mxc_nand(&mx35pdk_nand_board_info); |
581 | imx35_add_sdhci_esdhc_imx(0, NULL); | 579 | imx35_add_sdhci_esdhc_imx(0, NULL); |
582 | 580 | ||
583 | if (mxc_expio_init(MX35_CS5_BASE_ADDR, EXPIO_PARENT_INT)) | 581 | if (mxc_expio_init(MX35_CS5_BASE_ADDR, IMX_GPIO_NR(1, 1))) |
584 | pr_warn("Init of the debugboard failed, all " | 582 | pr_warn("Init of the debugboard failed, all " |
585 | "devices on the debugboard are unusable.\n"); | 583 | "devices on the debugboard are unusable.\n"); |
586 | imx35_add_imx_i2c0(&mx35_3ds_i2c0_data); | 584 | imx35_add_imx_i2c0(&mx35_3ds_i2c0_data); |