[ARM] 4817/1: RealView: Move the AMBA resource definitions to realview_eb.c

This patch moves the IRQ and DMA definitions from core.h into
realview_eb.c since they are platform-specific. It adds a
realview_eb11mp_fixup function to adjust the IRQ numbers if the
ARM11MPCore tile is fitted. The realview_smc91x_device is also moved
from core.c into realview_eb.c.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

3 files changed, 123 insertions, 83 deletions

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 8cabfec31da2..046d31ce27b0 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -123,26 +123,6 @@ struct platform_device realview_flash_device = {
         .resource               = &realview_flash_resource,
 };
 
-static struct resource realview_smc91x_resources[] = {
-        [0] = {
-                .start          = REALVIEW_ETH_BASE,
-                .end            = REALVIEW_ETH_BASE + SZ_64K - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start          = IRQ_ETH,
-                .end            = IRQ_ETH,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device realview_smc91x_device = {
-        .name           = "smc91x",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(realview_smc91x_resources),
-        .resource       = realview_smc91x_resources,
-};
-
 static struct resource realview_i2c_resource = {
         .start          = REALVIEW_I2C_BASE,
         .end            = REALVIEW_I2C_BASE + SZ_4K - 1,
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 2b53420f9c1b..9206db7b80bc 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -38,7 +38,7 @@ static struct amba_device name##_device = {			\
         },                                                      \
         .res            = {                                     \
                 .start  = REALVIEW_##base##_BASE,               \
-                .end    = (REALVIEW_##base##_BASE) + SZ_4K - 1,\
+                .end    = (REALVIEW_##base##_BASE) + SZ_4K - 1, \
                 .flags  = IORESOURCE_MEM,                       \
         },                                                      \
         .dma_mask       = ~0,                                   \
@@ -46,68 +46,7 @@ static struct amba_device name##_device = {			\
         /* .dma         = base##_DMA,*/                         \
 }
 
-/*
- * These devices are connected via the core APB bridge
- */
-#define GPIO2_IRQ       { IRQ_GPIOINT2, NO_IRQ }
-#define GPIO2_DMA       { 0, 0 }
-#define GPIO3_IRQ       { IRQ_GPIOINT3, NO_IRQ }
-#define GPIO3_DMA       { 0, 0 }
-
-#define AACI_IRQ        { IRQ_AACI, NO_IRQ }
-#define AACI_DMA        { 0x80, 0x81 }
-#define MMCI0_IRQ       { IRQ_MMCI0A,IRQ_MMCI0B }
-#define MMCI0_DMA       { 0x84, 0 }
-#define KMI0_IRQ        { IRQ_KMI0, NO_IRQ }
-#define KMI0_DMA        { 0, 0 }
-#define KMI1_IRQ        { IRQ_KMI1, NO_IRQ }
-#define KMI1_DMA        { 0, 0 }
-
-/*
- * These devices are connected directly to the multi-layer AHB switch
- */
-#define SMC_IRQ         { NO_IRQ, NO_IRQ }
-#define SMC_DMA         { 0, 0 }
-#define MPMC_IRQ        { NO_IRQ, NO_IRQ }
-#define MPMC_DMA        { 0, 0 }
-#define CLCD_IRQ        { IRQ_CLCDINT, NO_IRQ }
-#define CLCD_DMA        { 0, 0 }
-#define DMAC_IRQ        { IRQ_DMAINT, NO_IRQ }
-#define DMAC_DMA        { 0, 0 }
-
-/*
- * These devices are connected via the core APB bridge
- */
-#define SCTL_IRQ        { NO_IRQ, NO_IRQ }
-#define SCTL_DMA        { 0, 0 }
-#define WATCHDOG_IRQ    { IRQ_WDOGINT, NO_IRQ }
-#define WATCHDOG_DMA    { 0, 0 }
-#define GPIO0_IRQ       { IRQ_GPIOINT0, NO_IRQ }
-#define GPIO0_DMA       { 0, 0 }
-#define GPIO1_IRQ       { IRQ_GPIOINT1, NO_IRQ }
-#define GPIO1_DMA       { 0, 0 }
-#define RTC_IRQ         { IRQ_RTCINT, NO_IRQ }
-#define RTC_DMA         { 0, 0 }
-
-/*
- * These devices are connected via the DMA APB bridge
- */
-#define SCI_IRQ         { IRQ_SCIINT, NO_IRQ }
-#define SCI_DMA         { 7, 6 }
-#define UART0_IRQ       { IRQ_UARTINT0, NO_IRQ }
-#define UART0_DMA       { 15, 14 }
-#define UART1_IRQ       { IRQ_UARTINT1, NO_IRQ }
-#define UART1_DMA       { 13, 12 }
-#define UART2_IRQ       { IRQ_UARTINT2, NO_IRQ }
-#define UART2_DMA       { 11, 10 }
-#define UART3_IRQ       { IRQ_UART3, NO_IRQ }
-#define UART3_DMA       { 0x86, 0x87 }
-#define SSP_IRQ         { IRQ_SSPINT, NO_IRQ }
-#define SSP_DMA         { 9, 8 }
-
-
 extern struct platform_device realview_flash_device;
-extern struct platform_device realview_smc91x_device;
 extern struct platform_device realview_i2c_device;
 extern struct mmc_platform_data realview_mmc0_plat_data;
 extern struct mmc_platform_data realview_mmc1_plat_data;
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 9c992568ee40..afcf27ceac57 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -109,6 +109,69 @@ static void __init realview_eb_map_io(void)
         iotable_init(realview_eb_io_desc, ARRAY_SIZE(realview_eb_io_desc));
 }
 
+/*
+ * RealView EB AMBA devices
+ */
+
+/*
+ * These devices are connected via the core APB bridge
+ */
+#define GPIO2_IRQ       { IRQ_EB_GPIO2, NO_IRQ }
+#define GPIO2_DMA       { 0, 0 }
+#define GPIO3_IRQ       { IRQ_EB_GPIO3, NO_IRQ }
+#define GPIO3_DMA       { 0, 0 }
+
+#define AACI_IRQ        { IRQ_EB_AACI, NO_IRQ }
+#define AACI_DMA        { 0x80, 0x81 }
+#define MMCI0_IRQ       { IRQ_EB_MMCI0A, IRQ_EB_MMCI0B }
+#define MMCI0_DMA       { 0x84, 0 }
+#define KMI0_IRQ        { IRQ_EB_KMI0, NO_IRQ }
+#define KMI0_DMA        { 0, 0 }
+#define KMI1_IRQ        { IRQ_EB_KMI1, NO_IRQ }
+#define KMI1_DMA        { 0, 0 }
+
+/*
+ * These devices are connected directly to the multi-layer AHB switch
+ */
+#define SMC_IRQ         { NO_IRQ, NO_IRQ }
+#define SMC_DMA         { 0, 0 }
+#define MPMC_IRQ        { NO_IRQ, NO_IRQ }
+#define MPMC_DMA        { 0, 0 }
+#define CLCD_IRQ        { IRQ_EB_CLCD, NO_IRQ }
+#define CLCD_DMA        { 0, 0 }
+#define DMAC_IRQ        { IRQ_EB_DMA, NO_IRQ }
+#define DMAC_DMA        { 0, 0 }
+
+/*
+ * These devices are connected via the core APB bridge
+ */
+#define SCTL_IRQ        { NO_IRQ, NO_IRQ }
+#define SCTL_DMA        { 0, 0 }
+#define WATCHDOG_IRQ    { IRQ_EB_WDOG, NO_IRQ }
+#define WATCHDOG_DMA    { 0, 0 }
+#define GPIO0_IRQ       { IRQ_EB_GPIO0, NO_IRQ }
+#define GPIO0_DMA       { 0, 0 }
+#define GPIO1_IRQ       { IRQ_EB_GPIO1, NO_IRQ }
+#define GPIO1_DMA       { 0, 0 }
+#define RTC_IRQ         { IRQ_EB_RTC, NO_IRQ }
+#define RTC_DMA         { 0, 0 }
+
+/*
+ * These devices are connected via the DMA APB bridge
+ */
+#define SCI_IRQ         { IRQ_EB_SCI, NO_IRQ }
+#define SCI_DMA         { 7, 6 }
+#define UART0_IRQ       { IRQ_EB_UART0, NO_IRQ }
+#define UART0_DMA       { 15, 14 }
+#define UART1_IRQ       { IRQ_EB_UART1, NO_IRQ }
+#define UART1_DMA       { 13, 12 }
+#define UART2_IRQ       { IRQ_EB_UART2, NO_IRQ }
+#define UART2_DMA       { 11, 10 }
+#define UART3_IRQ       { IRQ_EB_UART3, NO_IRQ }
+#define UART3_DMA       { 0x86, 0x87 }
+#define SSP_IRQ         { IRQ_EB_SSP, NO_IRQ }
+#define SSP_DMA         { 9, 8 }
+
 /* FPGA Primecells */
 AMBA_DEVICE(aaci,  "fpga:04", AACI,     NULL);
 AMBA_DEVICE(mmc0,  "fpga:05", MMCI0,    &realview_mmc0_plat_data);
@@ -154,6 +217,30 @@ static struct amba_device *amba_devs[] __initdata = {
         &kmi1_device,
 };
 
+/*
+ * RealView EB platform devices
+ */
+
+static struct resource realview_eb_smc91x_resources[] = {
+        [0] = {
+                .start          = REALVIEW_ETH_BASE,
+                .end            = REALVIEW_ETH_BASE + SZ_64K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = IRQ_EB_ETH,
+                .end            = IRQ_EB_ETH,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device realview_eb_smc91x_device = {
+        .name           = "smc91x",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(realview_eb_smc91x_resources),
+        .resource       = realview_eb_smc91x_resources,
+};
+
 static void __init gic_init_irq(void)
 {
 #ifdef CONFIG_REALVIEW_MPCORE
@@ -173,11 +260,45 @@ static void __init gic_init_irq(void)
 #endif
 }
 
+#ifdef CONFIG_REALVIEW_MPCORE
+/*
+ * Fix up the IRQ numbers for the RealView EB/ARM11MPCore tile
+ */
+static void realview_eb11mp_fixup(void)
+{
+        /* AMBA devices */
+        dmac_device.irq[0]      = IRQ_EB11MP_DMA;
+        uart0_device.irq[0]     = IRQ_EB11MP_UART0;
+        uart1_device.irq[0]     = IRQ_EB11MP_UART1;
+        uart2_device.irq[0]     = IRQ_EB11MP_UART2;
+        uart3_device.irq[0]     = IRQ_EB11MP_UART3;
+        clcd_device.irq[0]      = IRQ_EB11MP_CLCD;
+        wdog_device.irq[0]      = IRQ_EB11MP_WDOG;
+        gpio0_device.irq[0]     = IRQ_EB11MP_GPIO0;
+        gpio1_device.irq[0]     = IRQ_EB11MP_GPIO1;
+        gpio2_device.irq[0]     = IRQ_EB11MP_GPIO2;
+        rtc_device.irq[0]       = IRQ_EB11MP_RTC;
+        sci0_device.irq[0]      = IRQ_EB11MP_SCI;
+        ssp0_device.irq[0]      = IRQ_EB11MP_SSP;
+        aaci_device.irq[0]      = IRQ_EB11MP_AACI;
+        mmc0_device.irq[0]      = IRQ_EB11MP_MMCI0A;
+        mmc0_device.irq[1]      = IRQ_EB11MP_MMCI0B;
+        kmi0_device.irq[0]      = IRQ_EB11MP_KMI0;
+        kmi1_device.irq[0]      = IRQ_EB11MP_KMI1;
+
+        /* platform devices */
+        realview_eb_smc91x_resources[1].start   = IRQ_EB11MP_ETH;
+        realview_eb_smc91x_resources[1].end     = IRQ_EB11MP_ETH;
+}
+#endif
+
 static void __init realview_eb_init(void)
 {
         int i;
 
 #ifdef CONFIG_REALVIEW_MPCORE
+        realview_eb11mp_fixup();
+
         /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled
          * Bits:  .... ...0 0111 1001 0000 .... .... .... */
         l2x0_init(__io_address(REALVIEW_MPCORE_L220_BASE), 0x00790000, 0xfe000fff);
@@ -185,7 +306,7 @@ static void __init realview_eb_init(void)
         clk_register(&realview_clcd_clk);
 
         platform_device_register(&realview_flash_device);
-        platform_device_register(&realview_smc91x_device);
+        platform_device_register(&realview_eb_smc91x_device);
         platform_device_register(&realview_i2c_device);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {