ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()

The following commits change gpio-omap to use dynamic
IRQ allocation:

25db711 gpio/omap: Fix IRQ handling for SPARSE_IRQ
384ebe1 gpio/omap: Add DT support to GPIO driver

With dynamic allocation of IRQ the usage of OMAP_GPIO_IRQ
is no longer valid. We must be using gpio_to_irq() instead.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 03e0050a8961..3768088fa5cc 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -244,8 +244,6 @@ static struct resource h2_smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = OMAP_GPIO_IRQ(0),
-                .end    = OMAP_GPIO_IRQ(0),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
         },
 };
@@ -364,11 +362,9 @@ static struct tps65010_board tps_board = {
 static struct i2c_board_info __initdata h2_i2c_board_info[] = {
         {
                 I2C_BOARD_INFO("tps65010", 0x48),
-                .irq            = OMAP_GPIO_IRQ(58),
                 .platform_data  = &tps_board,
         }, {
                 I2C_BOARD_INFO("isp1301_omap", 0x2d),
-                .irq            = OMAP_GPIO_IRQ(2),
         },
 };
 
@@ -437,10 +433,14 @@ static void __init h2_init(void)
         omap_cfg_reg(E19_1610_KBR4);
         omap_cfg_reg(N19_1610_KBR5);
 
+        h2_smc91x_resources[1].start = gpio_to_irq(0);
+        h2_smc91x_resources[1].end = gpio_to_irq(0);
         platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
         omap_board_config = h2_config;
         omap_board_config_size = ARRAY_SIZE(h2_config);
         omap_serial_init();
+        h2_i2c_board_info[0].irq = gpio_to_irq(58);
+        h2_i2c_board_info[1].irq = gpio_to_irq(2);
         omap_register_i2c_bus(1, 100, h2_i2c_board_info,
                               ARRAY_SIZE(h2_i2c_board_info));
         omap1_usb_init(&h2_usb_config);