summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-cpuimx35.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-02 15:31:11 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-07-01 21:50:09 +0800
commit84715dd6c19e058557ab173d327ea65eac0ccb02 (patch)
tree16aabd33b4ca5a677e7fc34fb4adb6f3d60fecdb /arch/arm/mach-imx/mach-cpuimx35.c
parentcfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff)
downloadop-kernel-dev-84715dd6c19e058557ab173d327ea65eac0ccb02.zip
op-kernel-dev-84715dd6c19e058557ab173d327ea65eac0ccb02.tar.gz
ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()
This patch changes all the static gpio irq number assigning with IMX_GPIO_TO_IRQ() to run-time assigning with gpio_to_irq call, and in turn eliminates the macro IMX_GPIO_TO_IRQ(). Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx35.c')
-rw-r--r--arch/arm/mach-imx/mach-cpuimx35.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c
index c515f8e..73c4b65 100644
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@ -72,7 +72,7 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = {
I2C_BOARD_INFO("tsc2007", 0x48),
.type = "tsc2007",
.platform_data = &tsc2007_info,
- .irq = IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),
+ /* irq number is run-time assigned */
},
};
@@ -173,6 +173,7 @@ static void __init eukrea_cpuimx35_init(void)
imx35_add_imx_uart0(&uart_pdata);
imx35_add_mxc_nand(&eukrea_cpuimx35_nand_board_info);
+ eukrea_cpuimx35_i2c_devices[1].irq = gpio_to_irq(TSC2007_IRQGPIO);
i2c_register_board_info(0, eukrea_cpuimx35_i2c_devices,
ARRAY_SIZE(eukrea_cpuimx35_i2c_devices));
imx35_add_imx_i2c0(&eukrea_cpuimx35_i2c0_data);
OpenPOWER on IntegriCloud