aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2010-02-17 16:44:12 -0500
committerTony Lindgren <tony@atomide.com>2010-02-23 18:29:08 -0500
commit5772ca7d7897722e7ed4c476bafee0b07bd9193e (patch)
tree73d6bcc8284d8d99f2797d614b9c893a83b9e325 /arch/arm/mach-omap2/devices.c
parenta99db248afd4682a6a9e2aea465cb4c2eb6e26be (diff)
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>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r--arch/arm/mach-omap2/devices.c8
1 files changed, 4 insertions, 4 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[] = {
191 .flags = IORESOURCE_MEM, 191 .flags = IORESOURCE_MEM,
192 }, 192 },
193 { 193 {
194 .start = INT_44XX_MAIL_U0_MPU, 194 .start = OMAP44XX_IRQ_MAIL_U0,
195 .flags = IORESOURCE_IRQ, 195 .flags = IORESOURCE_IRQ,
196 }, 196 },
197}; 197};
@@ -720,13 +720,13 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
720 if (!cpu_is_omap44xx()) 720 if (!cpu_is_omap44xx())
721 return; 721 return;
722 base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET; 722 base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET;
723 irq = INT_44XX_MMC4_IRQ; 723 irq = OMAP44XX_IRQ_MMC4;
724 break; 724 break;
725 case 4: 725 case 4:
726 if (!cpu_is_omap44xx()) 726 if (!cpu_is_omap44xx())
727 return; 727 return;
728 base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET; 728 base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;
729 irq = INT_44XX_MMC5_IRQ; 729 irq = OMAP44XX_IRQ_MMC4;
730 break; 730 break;
731 default: 731 default:
732 continue; 732 continue;
@@ -738,7 +738,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
738 } else if (cpu_is_omap44xx()) { 738 } else if (cpu_is_omap44xx()) {
739 if (i < 3) { 739 if (i < 3) {
740 base += OMAP4_MMC_REG_OFFSET; 740 base += OMAP4_MMC_REG_OFFSET;
741 irq += IRQ_GIC_START; 741 irq += OMAP44XX_IRQ_GIC_START;
742 } 742 }
743 size = OMAP4_HSMMC_SIZE; 743 size = OMAP4_HSMMC_SIZE;
744 name = "mmci-omap-hs"; 744 name = "mmci-omap-hs";