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, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e2d7ae4418f2..a0c1a1c15e75 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -128,8 +128,6 @@ static struct resource osk5912_smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = OMAP_GPIO_IRQ(0),
-                .end    = OMAP_GPIO_IRQ(0),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
 };
@@ -146,8 +144,6 @@ static struct platform_device osk5912_smc91x_device = {
 
 static struct resource osk5912_cf_resources[] = {
         [0] = {
-                .start  = OMAP_GPIO_IRQ(62),
-                .end    = OMAP_GPIO_IRQ(62),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -239,7 +235,6 @@ static struct tps65010_board tps_board = {
 static struct i2c_board_info __initdata osk_i2c_board_info[] = {
         {
                 I2C_BOARD_INFO("tps65010", 0x48),
-                .irq            = OMAP_GPIO_IRQ(OMAP_MPUIO(1)),
                 .platform_data  = &tps_board,
 
         },
@@ -413,7 +408,6 @@ static struct spi_board_info __initdata mistral_boardinfo[] = { {
         /* MicroWire (bus 2) CS0 has an ads7846e */
         .modalias               = "ads7846",
         .platform_data          = &mistral_ts_info,
-        .irq                    = OMAP_GPIO_IRQ(4),
         .max_speed_hz           = 120000 /* max sample rate at 3V */
                                         * 26 /* command + data + overhead */,
         .bus_num                = 2,
@@ -476,6 +470,7 @@ static void __init osk_mistral_init(void)
         gpio_direction_input(4);
         irq_set_irq_type(gpio_to_irq(4), IRQ_TYPE_EDGE_FALLING);
 
+        mistral_boardinfo[0].irq = gpio_to_irq(4);
         spi_register_board_info(mistral_boardinfo,
                         ARRAY_SIZE(mistral_boardinfo));
 
@@ -547,6 +542,10 @@ static void __init osk_init(void)
 
         osk_flash_resource.end = osk_flash_resource.start = omap_cs3_phys();
         osk_flash_resource.end += SZ_32M - 1;
+        osk5912_smc91x_resources[1].start = gpio_to_irq(0);
+        osk5912_smc91x_resources[1].end = gpio_to_irq(0);
+        osk5912_cf_resources[0].start = gpio_to_irq(62);
+        osk5912_cf_resources[0].end = gpio_to_irq(62);
         platform_add_devices(osk5912_devices, ARRAY_SIZE(osk5912_devices));
         omap_board_config = osk_config;
         omap_board_config_size = ARRAY_SIZE(osk_config);
@@ -563,6 +562,7 @@ static void __init osk_init(void)
                 gpio_direction_input(OMAP_MPUIO(1));
 
         omap_serial_init();
+        osk_i2c_board_info[0].irq = gpio_to_irq(OMAP_MPUIO(1));
         omap_register_i2c_bus(1, 400, osk_i2c_board_info,
                               ARRAY_SIZE(osk_i2c_board_info));
         osk_mistral_init();