Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / mach-davinci / devices.c

diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index e8dbbb7..40bd802 100644 (file)
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -11,21 +11,20 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/edma.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/reboot.h>
 
 #include <mach/hardware.h>
-#include <linux/platform_data/i2c-davinci.h>
-#include <mach/irqs.h>
 #include <mach/cputype.h>
 #include <mach/mux.h>
-#include <linux/platform_data/mmc-davinci.h>
 #include <mach/time.h>
-#include <linux/platform_data/edma.h>
-
 
 #include "davinci.h"
+#include "irqs.h"
 
 #define DAVINCI_I2C_BASE            0x01C21000
 #define DAVINCI_ATA_BASE            0x01C66000
@@ -56,7 +55,7 @@ static struct resource i2c_resources[] = {
                .flags          = IORESOURCE_MEM,
        },
        {
-               .start          = IRQ_I2C,
+               .start          = DAVINCI_INTC_IRQ(IRQ_I2C),
                .flags          = IORESOURCE_IRQ,
        },
 };
@@ -84,8 +83,8 @@ static struct resource ide_resources[] = {
                .flags          = IORESOURCE_MEM,
        },
        {
-               .start          = IRQ_IDE,
-               .end            = IRQ_IDE,
+               .start          = DAVINCI_INTC_IRQ(IRQ_IDE),
+               .end            = DAVINCI_INTC_IRQ(IRQ_IDE),
                .flags          = IORESOURCE_IRQ,
        },
 };
@@ -133,11 +132,11 @@ static struct resource mmcsd0_resources[] = {
        },
        /* IRQs:  MMC/SD, then SDIO */
        {
-               .start = IRQ_MMCINT,
+               .start = DAVINCI_INTC_IRQ(IRQ_MMCINT),
                .flags = IORESOURCE_IRQ,
        }, {
                /* different on dm355 */
-               .start = IRQ_SDIOINT,
+               .start = DAVINCI_INTC_IRQ(IRQ_SDIOINT),
                .flags = IORESOURCE_IRQ,
        },
 };
@@ -163,10 +162,10 @@ static struct resource mmcsd1_resources[] = {
        },
        /* IRQs:  MMC/SD, then SDIO */
        {
-               .start = IRQ_DM355_MMCINT1,
+               .start = DAVINCI_INTC_IRQ(IRQ_DM355_MMCINT1),
                .flags = IORESOURCE_IRQ,
        }, {
-               .start = IRQ_DM355_SDIOINT1,
+               .start = DAVINCI_INTC_IRQ(IRQ_DM355_SDIOINT1),
                .flags = IORESOURCE_IRQ,
        },
 };
@@ -219,7 +218,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
                        mmcsd1_resources[0].start = DM365_MMCSD1_BASE;
                        mmcsd1_resources[0].end = DM365_MMCSD1_BASE +
                                                        SZ_4K - 1;
-                       mmcsd1_resources[2].start = IRQ_DM365_SDIOINT1;
+                       mmcsd1_resources[2].start = DAVINCI_INTC_IRQ(
+                                                       IRQ_DM365_SDIOINT1);
                        davinci_mmcsd1_device.name = "da830-mmc";
                } else
                        break;
@@ -230,7 +230,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
                if (cpu_is_davinci_dm355()) {
                        mmcsd0_resources[0].start = DM355_MMCSD0_BASE;
                        mmcsd0_resources[0].end = DM355_MMCSD0_BASE + SZ_4K - 1;
-                       mmcsd0_resources[2].start = IRQ_DM355_SDIOINT0;
+                       mmcsd0_resources[2].start = DAVINCI_INTC_IRQ(
+                                                       IRQ_DM355_SDIOINT0);
 
                        /* expose all 6 MMC0 signals:  CLK, CMD, DATA[0..3] */
                        davinci_cfg_reg(DM355_MMCSD0);
@@ -241,7 +242,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
                        mmcsd0_resources[0].start = DM365_MMCSD0_BASE;
                        mmcsd0_resources[0].end = DM365_MMCSD0_BASE +
                                                        SZ_4K - 1;
-                       mmcsd0_resources[2].start = IRQ_DM365_SDIOINT0;
+                       mmcsd0_resources[2].start = DAVINCI_INTC_IRQ(
+                                                       IRQ_DM365_SDIOINT0);
                        davinci_mmcsd0_device.name = "da830-mmc";
                } else if (cpu_is_davinci_dm644x()) {
                        /* REVISIT: should this be in board-init code? */
@@ -313,13 +315,13 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata)
 struct davinci_timer_instance davinci_timer_instance[2] = {
        {
                .base           = DAVINCI_TIMER0_BASE,
-               .bottom_irq     = IRQ_TINT0_TINT12,
-               .top_irq        = IRQ_TINT0_TINT34,
+               .bottom_irq     = DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12),
+               .top_irq        = DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34),
        },
        {
                .base           = DAVINCI_TIMER1_BASE,
-               .bottom_irq     = IRQ_TINT1_TINT12,
-               .top_irq        = IRQ_TINT1_TINT34,
+               .bottom_irq     = DAVINCI_INTC_IRQ(IRQ_TINT1_TINT12),
+               .top_irq        = DAVINCI_INTC_IRQ(IRQ_TINT1_TINT34),
        },
 };