Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

[pandora-kernel.git] / arch / arm / mach-realview / realview_pba8.c

diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 7d0f173..fb68665 100644 (file)
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -126,47 +126,26 @@ static struct pl022_ssp_controller ssp0_plat_data = {
  */
 
 #define GPIO2_IRQ              { IRQ_PBA8_GPIO2, NO_IRQ }
-#define GPIO2_DMA              { 0, 0 }
 #define GPIO3_IRQ              { IRQ_PBA8_GPIO3, NO_IRQ }
-#define GPIO3_DMA              { 0, 0 }
 #define AACI_IRQ               { IRQ_PBA8_AACI, NO_IRQ }
-#define AACI_DMA               { 0x80, 0x81 }
 #define MMCI0_IRQ              { IRQ_PBA8_MMCI0A, IRQ_PBA8_MMCI0B }
-#define MMCI0_DMA              { 0x84, 0 }
 #define KMI0_IRQ               { IRQ_PBA8_KMI0, NO_IRQ }
-#define KMI0_DMA               { 0, 0 }
 #define KMI1_IRQ               { IRQ_PBA8_KMI1, NO_IRQ }
-#define KMI1_DMA               { 0, 0 }
 #define PBA8_SMC_IRQ           { NO_IRQ, NO_IRQ }
-#define PBA8_SMC_DMA           { 0, 0 }
 #define MPMC_IRQ               { NO_IRQ, NO_IRQ }
-#define MPMC_DMA               { 0, 0 }
 #define PBA8_CLCD_IRQ          { IRQ_PBA8_CLCD, NO_IRQ }
-#define PBA8_CLCD_DMA          { 0, 0 }
 #define DMAC_IRQ               { IRQ_PBA8_DMAC, NO_IRQ }
-#define DMAC_DMA               { 0, 0 }
 #define SCTL_IRQ               { NO_IRQ, NO_IRQ }
-#define SCTL_DMA               { 0, 0 }
 #define PBA8_WATCHDOG_IRQ      { IRQ_PBA8_WATCHDOG, NO_IRQ }
-#define PBA8_WATCHDOG_DMA      { 0, 0 }
 #define PBA8_GPIO0_IRQ         { IRQ_PBA8_GPIO0, NO_IRQ }
-#define PBA8_GPIO0_DMA         { 0, 0 }
 #define GPIO1_IRQ              { IRQ_PBA8_GPIO1, NO_IRQ }
-#define GPIO1_DMA              { 0, 0 }
 #define PBA8_RTC_IRQ           { IRQ_PBA8_RTC, NO_IRQ }
-#define PBA8_RTC_DMA           { 0, 0 }
 #define SCI_IRQ                        { IRQ_PBA8_SCI, NO_IRQ }
-#define SCI_DMA                        { 7, 6 }
 #define PBA8_UART0_IRQ         { IRQ_PBA8_UART0, NO_IRQ }
-#define PBA8_UART0_DMA         { 15, 14 }
 #define PBA8_UART1_IRQ         { IRQ_PBA8_UART1, NO_IRQ }
-#define PBA8_UART1_DMA         { 13, 12 }
 #define PBA8_UART2_IRQ         { IRQ_PBA8_UART2, NO_IRQ }
-#define PBA8_UART2_DMA         { 11, 10 }
 #define PBA8_UART3_IRQ         { IRQ_PBA8_UART3, NO_IRQ }
-#define PBA8_UART3_DMA         { 0x86, 0x87 }
 #define PBA8_SSP_IRQ           { IRQ_PBA8_SSP, NO_IRQ }
-#define PBA8_SSP_DMA           { 9, 8 }
 
 /* FPGA Primecells */
 AMBA_DEVICE(aaci,      "fpga:aaci",    AACI,           NULL);
@@ -334,6 +313,7 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
        .boot_params    = PLAT_PHYS_OFFSET + 0x00000100,
        .fixup          = realview_fixup,
        .map_io         = realview_pba8_map_io,
+       .init_early     = realview_init_early,
        .init_irq       = gic_init_irq,
        .timer          = &realview_pba8_timer,
        .init_machine   = realview_pba8_init,