omap4: Use irq line defines from irq-44xx.h

This patch removes all the omap4 specific irq line
defines from plat/irqs.h and includes auto-generated
irqs-44xx.h
All the legacy naming style defines are replaced with the one
from irqs-44xx.h

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
[tony@atomide.com: updated to compile with usb-musb.c]
Signed-off-by: Tony Lindgren <tony@atomide.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c104d5ca65b2..23e4d7733610 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -191,7 +191,7 @@ static struct resource omap4_mbox_resources[] = {
                 .flags          = IORESOURCE_MEM,
         },
         {
-                .start          = INT_44XX_MAIL_U0_MPU,
+                .start          = OMAP44XX_IRQ_MAIL_U0,
                 .flags          = IORESOURCE_IRQ,
         },
 };
@@ -720,13 +720,13 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                         if (!cpu_is_omap44xx())
                                 return;
                         base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET;
-                        irq = INT_44XX_MMC4_IRQ;
+                        irq = OMAP44XX_IRQ_MMC4;
                         break;
                 case 4:
                         if (!cpu_is_omap44xx())
                                 return;
                         base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;
-                        irq = INT_44XX_MMC5_IRQ;
+                        irq = OMAP44XX_IRQ_MMC4;
                         break;
                 default:
                         continue;
@@ -738,7 +738,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                 } else if (cpu_is_omap44xx()) {
                         if (i < 3) {
                                 base += OMAP4_MMC_REG_OFFSET;
-                                irq += IRQ_GIC_START;
+                                irq += OMAP44XX_IRQ_GIC_START;
                         }
                         size = OMAP4_HSMMC_SIZE;
                         name = "mmci-omap-hs";
diff --git a/arch/arm/mach-omap2/timer-mpu.c b/arch/arm/mach-omap2/timer-mpu.c
index c1a650a9910f..954682e64399 100644
--- a/arch/arm/mach-omap2/timer-mpu.c
+++ b/arch/arm/mach-omap2/timer-mpu.c
@@ -28,7 +28,7 @@
  */
 void __cpuinit local_timer_setup(struct clock_event_device *evt)
 {
-        evt->irq = INT_44XX_LOCALTIMER_IRQ;
+        evt->irq = OMAP44XX_IRQ_LOCALTIMER;
         twd_timer_setup(evt);
 }
 
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index d5bea43e9422..6d41fa7b2ce8 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -94,8 +94,8 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
                 musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
         } else if (cpu_is_omap44xx()) {
                 musb_resources[0].start = OMAP44XX_HSUSB_OTG_BASE;
-                musb_resources[1].start = INT_44XX_HS_USB_MC;
-                musb_resources[2].start = INT_44XX_HS_USB_DMA;
+                musb_resources[1].start = OMAP44XX_IRQ_HS_USB_MC_N;
+                musb_resources[2].start = OMAP44XX_IRQ_HS_USB_DMA_N;
         }
         musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;