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-mx27_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-mx27_3ds.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 18b9bcaa40e3..eeff0b6aaba3 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #define SD1_EN_GPIO IMX_GPIO_NR(2, 25) | 48 | #define SD1_EN_GPIO IMX_GPIO_NR(2, 25) |
49 | #define OTG_PHY_RESET_GPIO IMX_GPIO_NR(2, 23) | 49 | #define OTG_PHY_RESET_GPIO IMX_GPIO_NR(2, 23) |
50 | #define SPI2_SS0 IMX_GPIO_NR(4, 21) | 50 | #define SPI2_SS0 IMX_GPIO_NR(4, 21) |
51 | #define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(3, 28)) | ||
52 | #define PMIC_INT IMX_GPIO_NR(3, 14) | 51 | #define PMIC_INT IMX_GPIO_NR(3, 14) |
53 | #define SPI1_SS0 IMX_GPIO_NR(4, 28) | 52 | #define SPI1_SS0 IMX_GPIO_NR(4, 28) |
54 | #define SD1_CD IMX_GPIO_NR(2, 26) | 53 | #define SD1_CD IMX_GPIO_NR(2, 26) |
@@ -500,7 +499,7 @@ static void __init mx27pdk_init(void) | |||
500 | spi_register_board_info(mx27_3ds_spi_devs, | 499 | spi_register_board_info(mx27_3ds_spi_devs, |
501 | ARRAY_SIZE(mx27_3ds_spi_devs)); | 500 | ARRAY_SIZE(mx27_3ds_spi_devs)); |
502 | 501 | ||
503 | if (mxc_expio_init(MX27_CS5_BASE_ADDR, EXPIO_PARENT_INT)) | 502 | if (mxc_expio_init(MX27_CS5_BASE_ADDR, IMX_GPIO_NR(3, 28))) |
504 | pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n"); | 503 | pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n"); |
505 | imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data); | 504 | imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data); |
506 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 505 | platform_add_devices(devices, ARRAY_SIZE(devices)); |