aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-cpuimx51sd.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-02 02:31:11 -0500
committerShawn Guo <shawn.guo@linaro.org>2012-07-01 09:50:09 -0400
commit84715dd6c19e058557ab173d327ea65eac0ccb02 (patch)
tree16aabd33b4ca5a677e7fc34fb4adb6f3d60fecdb /arch/arm/mach-imx/mach-cpuimx51sd.c
parentcfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff)
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-cpuimx51sd.c')
-rw-r--r--arch/arm/mach-imx/mach-cpuimx51sd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c
index ac50f1671e38..e42c6f8bed70 100644
--- a/arch/arm/mach-imx/mach-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
@@ -259,7 +259,7 @@ static struct spi_board_info cpuimx51sd_spi_device[] = {
259 .mode = SPI_MODE_0, 259 .mode = SPI_MODE_0,
260 .chip_select = 0, 260 .chip_select = 0,
261 .platform_data = &mcp251x_info, 261 .platform_data = &mcp251x_info,
262 .irq = IMX_GPIO_TO_IRQ(CAN_IRQGPIO) 262 /* irq number is run-time assigned */
263 }, 263 },
264}; 264};
265 265
@@ -310,6 +310,7 @@ static void __init eukrea_cpuimx51sd_init(void)
310 msleep(20); 310 msleep(20);
311 gpio_set_value(CAN_RST, 1); 311 gpio_set_value(CAN_RST, 1);
312 imx51_add_ecspi(0, &cpuimx51sd_ecspi1_pdata); 312 imx51_add_ecspi(0, &cpuimx51sd_ecspi1_pdata);
313 cpuimx51sd_spi_device[0].irq = gpio_to_irq(CAN_IRQGPIO);
313 spi_register_board_info(cpuimx51sd_spi_device, 314 spi_register_board_info(cpuimx51sd_spi_device,
314 ARRAY_SIZE(cpuimx51sd_spi_device)); 315 ARRAY_SIZE(cpuimx51sd_spi_device));
315 316