aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-vpr200.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-vpr200.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-vpr200.c')
-rw-r--r--arch/arm/mach-imx/mach-vpr200.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index add8c69c6c1a..e36eb2c40f41 100644
--- a/arch/arm/mach-imx/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -162,7 +162,7 @@ static struct i2c_board_info vpr200_i2c_devices[] = {
162 }, { 162 }, {
163 I2C_BOARD_INFO("mc13892", 0x08), 163 I2C_BOARD_INFO("mc13892", 0x08),
164 .platform_data = &vpr200_pmic, 164 .platform_data = &vpr200_pmic,
165 .irq = IMX_GPIO_TO_IRQ(GPIO_PMIC_INT), 165 /* irq number is run-time assigned */
166 } 166 }
167}; 167};
168 168
@@ -299,6 +299,7 @@ static void __init vpr200_board_init(void)
299 imx35_add_mxc_nand(&vpr200_nand_board_info); 299 imx35_add_mxc_nand(&vpr200_nand_board_info);
300 imx35_add_sdhci_esdhc_imx(0, NULL); 300 imx35_add_sdhci_esdhc_imx(0, NULL);
301 301
302 vpr200_i2c_devices[1].irq = gpio_to_irq(GPIO_PMIC_INT);
302 i2c_register_board_info(0, vpr200_i2c_devices, 303 i2c_register_board_info(0, vpr200_i2c_devices,
303 ARRAY_SIZE(vpr200_i2c_devices)); 304 ARRAY_SIZE(vpr200_i2c_devices));
304 305