Patched in Tegra support.

11 files changed, 137 insertions, 109 deletions

diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index 63d8e9f81b9..c1f38f6625b 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -3,9 +3,9 @@ menu "Versatile platform type"
 
 config ARCH_VERSATILE_PB
         bool "Support Versatile Platform Baseboard for ARM926EJ-S"
-        default y
         select CPU_ARM926T
         select MIGHT_HAVE_PCI
+        default y
         help
           Include support for the ARM(R) Versatile Platform Baseboard
           for the ARM926EJ-S.
@@ -19,8 +19,8 @@ config MACH_VERSATILE_AB
 
 config MACH_VERSATILE_DT
         bool "Support Versatile platform from device tree"
-        select CPU_ARM926T
         select USE_OF
+        select CPU_ARM926T
         help
           Include support for the ARM(R) Versatile/PB platform,
           using the device tree for discovery
diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot
index ff0a4b5b0a8..c7e75acfe6c 100644
--- a/arch/arm/mach-versatile/Makefile.boot
+++ b/arch/arm/mach-versatile/Makefile.boot
@@ -1,4 +1,4 @@
-   zreladdr-y   += 0x00008000
+   zreladdr-y   := 0x00008000
 params_phys-y   := 0x00000100
 initrd_phys-y   := 0x00800000
 
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 5d592945036..e340a54251d 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -22,6 +22,7 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
+#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/irqdomain.h>
 #include <linux/of_address.h>
@@ -32,12 +33,13 @@
 #include <linux/amba/mmci.h>
 #include <linux/amba/pl022.h>
 #include <linux/io.h>
-#include <linux/irqchip/versatile-fpga.h>
 #include <linux/gfp.h>
 #include <linux/clkdev.h>
 #include <linux/mtd/physmap.h>
 
+#include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/leds.h>
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/icst.h>
 #include <asm/hardware/vic.h>
@@ -52,6 +54,7 @@
 #include <asm/hardware/timer-sp.h>
 
 #include <plat/clcd.h>
+#include <plat/fpga-irq.h>
 #include <plat/sched_clock.h>
 
 #include "core.h"
@@ -65,6 +68,12 @@
 #define VA_VIC_BASE             __io_address(VERSATILE_VIC_BASE)
 #define VA_SIC_BASE             __io_address(VERSATILE_SIC_BASE)
 
+static struct fpga_irq_data sic_irq = {
+        .base           = VA_SIC_BASE,
+        .irq_start      = IRQ_SIC_START,
+        .chip.name      = "SIC",
+};
+
 #if 1
 #define IRQ_MMCI0A      IRQ_VICSOURCE22
 #define IRQ_AACI        IRQ_VICSOURCE24
@@ -90,19 +99,13 @@ static const struct of_device_id sic_of_match[] __initconst = {
 
 void __init versatile_init_irq(void)
 {
-        struct device_node *np;
-
-        np = of_find_matching_node_by_address(NULL, vic_of_match,
-                                              VERSATILE_VIC_BASE);
-        __vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0, np);
+        vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0);
+        irq_domain_generate_simple(vic_of_match, VERSATILE_VIC_BASE, IRQ_VIC_START);
 
         writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
 
-        np = of_find_matching_node_by_address(NULL, sic_of_match,
-                                              VERSATILE_SIC_BASE);
-
-        fpga_irq_init(VA_SIC_BASE, "SIC", IRQ_SIC_START,
-                IRQ_VICSOURCE31, ~PIC_MASK, np);
+        fpga_irq_init(IRQ_VICSOURCE31, ~PIC_MASK, &sic_irq);
+        irq_domain_generate_simple(sic_of_match, VERSATILE_SIC_BASE, IRQ_SIC_START);
 
         /*
          * Interrupts on secondary controller from 0 to 8 are routed to
@@ -138,6 +141,11 @@ static struct map_desc versatile_io_desc[] __initdata = {
         },
 #ifdef CONFIG_MACH_VERSATILE_AB
         {
+                .virtual        =  IO_ADDRESS(VERSATILE_GPIO0_BASE),
+                .pfn            = __phys_to_pfn(VERSATILE_GPIO0_BASE),
+                .length         = SZ_4K,
+                .type           = MT_DEVICE
+        }, {
                 .virtual        =  IO_ADDRESS(VERSATILE_IB2_BASE),
                 .pfn            = __phys_to_pfn(VERSATILE_IB2_BASE),
                 .length         = SZ_64M,
@@ -169,6 +177,24 @@ static struct map_desc versatile_io_desc[] __initdata = {
                 .length         = VERSATILE_PCI_CFG_BASE_SIZE,
                 .type           = MT_DEVICE
         },
+#if 0
+        {
+                .virtual        =  VERSATILE_PCI_VIRT_MEM_BASE0,
+                .pfn            = __phys_to_pfn(VERSATILE_PCI_MEM_BASE0),
+                .length         = SZ_16M,
+                .type           = MT_DEVICE
+        }, {
+                .virtual        =  VERSATILE_PCI_VIRT_MEM_BASE1,
+                .pfn            = __phys_to_pfn(VERSATILE_PCI_MEM_BASE1),
+                .length         = SZ_16M,
+                .type           = MT_DEVICE
+        }, {
+                .virtual        =  VERSATILE_PCI_VIRT_MEM_BASE2,
+                .pfn            = __phys_to_pfn(VERSATILE_PCI_MEM_BASE2),
+                .length         = SZ_16M,
+                .type           = MT_DEVICE
+        },
+#endif
 #endif
 };
 
@@ -562,58 +588,58 @@ static struct pl022_ssp_controller ssp0_plat_data = {
         .num_chipselect = 1,
 };
 
-#define AACI_IRQ        { IRQ_AACI }
+#define AACI_IRQ        { IRQ_AACI, NO_IRQ }
 #define MMCI0_IRQ       { IRQ_MMCI0A,IRQ_SIC_MMCI0B }
-#define KMI0_IRQ        { IRQ_SIC_KMI0 }
-#define KMI1_IRQ        { IRQ_SIC_KMI1 }
+#define KMI0_IRQ        { IRQ_SIC_KMI0, NO_IRQ }
+#define KMI1_IRQ        { IRQ_SIC_KMI1, NO_IRQ }
 
 /*
  * These devices are connected directly to the multi-layer AHB switch
  */
-#define SMC_IRQ         { }
-#define MPMC_IRQ        { }
-#define CLCD_IRQ        { IRQ_CLCDINT }
-#define DMAC_IRQ        { IRQ_DMAINT }
+#define SMC_IRQ         { NO_IRQ, NO_IRQ }
+#define MPMC_IRQ        { NO_IRQ, NO_IRQ }
+#define CLCD_IRQ        { IRQ_CLCDINT, NO_IRQ }
+#define DMAC_IRQ        { IRQ_DMAINT, NO_IRQ }
 
 /*
  * These devices are connected via the core APB bridge
  */
-#define SCTL_IRQ        { }
-#define WATCHDOG_IRQ    { IRQ_WDOGINT }
-#define GPIO0_IRQ       { IRQ_GPIOINT0 }
-#define GPIO1_IRQ       { IRQ_GPIOINT1 }
-#define RTC_IRQ         { IRQ_RTCINT }
+#define SCTL_IRQ        { NO_IRQ, NO_IRQ }
+#define WATCHDOG_IRQ    { IRQ_WDOGINT, NO_IRQ }
+#define GPIO0_IRQ       { IRQ_GPIOINT0, NO_IRQ }
+#define GPIO1_IRQ       { IRQ_GPIOINT1, NO_IRQ }
+#define RTC_IRQ         { IRQ_RTCINT, NO_IRQ }
 
 /*
  * These devices are connected via the DMA APB bridge
  */
-#define SCI_IRQ         { IRQ_SCIINT }
-#define UART0_IRQ       { IRQ_UARTINT0 }
-#define UART1_IRQ       { IRQ_UARTINT1 }
-#define UART2_IRQ       { IRQ_UARTINT2 }
-#define SSP_IRQ         { IRQ_SSPINT }
+#define SCI_IRQ         { IRQ_SCIINT, NO_IRQ }
+#define UART0_IRQ       { IRQ_UARTINT0, NO_IRQ }
+#define UART1_IRQ       { IRQ_UARTINT1, NO_IRQ }
+#define UART2_IRQ       { IRQ_UARTINT2, NO_IRQ }
+#define SSP_IRQ         { IRQ_SSPINT, NO_IRQ }
 
 /* FPGA Primecells */
-APB_DEVICE(aaci,  "fpga:04", AACI,     NULL);
-APB_DEVICE(mmc0,  "fpga:05", MMCI0,    &mmc0_plat_data);
-APB_DEVICE(kmi0,  "fpga:06", KMI0,     NULL);
-APB_DEVICE(kmi1,  "fpga:07", KMI1,     NULL);
+AMBA_DEVICE(aaci,  "fpga:04", AACI,     NULL);
+AMBA_DEVICE(mmc0,  "fpga:05", MMCI0,    &mmc0_plat_data);
+AMBA_DEVICE(kmi0,  "fpga:06", KMI0,     NULL);
+AMBA_DEVICE(kmi1,  "fpga:07", KMI1,     NULL);
 
 /* DevChip Primecells */
-AHB_DEVICE(smc,   "dev:00",  SMC,      NULL);
-AHB_DEVICE(mpmc,  "dev:10",  MPMC,     NULL);
-AHB_DEVICE(clcd,  "dev:20",  CLCD,     &clcd_plat_data);
-AHB_DEVICE(dmac,  "dev:30",  DMAC,     NULL);
-APB_DEVICE(sctl,  "dev:e0",  SCTL,     NULL);
-APB_DEVICE(wdog,  "dev:e1",  WATCHDOG, NULL);
-APB_DEVICE(gpio0, "dev:e4",  GPIO0,    &gpio0_plat_data);
-APB_DEVICE(gpio1, "dev:e5",  GPIO1,    &gpio1_plat_data);
-APB_DEVICE(rtc,   "dev:e8",  RTC,      NULL);
-APB_DEVICE(sci0,  "dev:f0",  SCI,      NULL);
-APB_DEVICE(uart0, "dev:f1",  UART0,    NULL);
-APB_DEVICE(uart1, "dev:f2",  UART1,    NULL);
-APB_DEVICE(uart2, "dev:f3",  UART2,    NULL);
-APB_DEVICE(ssp0,  "dev:f4",  SSP,      &ssp0_plat_data);
+AMBA_DEVICE(smc,   "dev:00",  SMC,      NULL);
+AMBA_DEVICE(mpmc,  "dev:10",  MPMC,     NULL);
+AMBA_DEVICE(clcd,  "dev:20",  CLCD,     &clcd_plat_data);
+AMBA_DEVICE(dmac,  "dev:30",  DMAC,     NULL);
+AMBA_DEVICE(sctl,  "dev:e0",  SCTL,     NULL);
+AMBA_DEVICE(wdog,  "dev:e1",  WATCHDOG, NULL);
+AMBA_DEVICE(gpio0, "dev:e4",  GPIO0,    &gpio0_plat_data);
+AMBA_DEVICE(gpio1, "dev:e5",  GPIO1,    &gpio1_plat_data);
+AMBA_DEVICE(rtc,   "dev:e8",  RTC,      NULL);
+AMBA_DEVICE(sci0,  "dev:f0",  SCI,      NULL);
+AMBA_DEVICE(uart0, "dev:f1",  UART0,    NULL);
+AMBA_DEVICE(uart1, "dev:f2",  UART1,    NULL);
+AMBA_DEVICE(uart2, "dev:f3",  UART2,    NULL);
+AMBA_DEVICE(ssp0,  "dev:f4",  SSP,      &ssp0_plat_data);
 
 static struct amba_device *amba_devs[] __initdata = {
         &dmac_device,
@@ -644,18 +670,17 @@ static struct amba_device *amba_devs[] __initdata = {
  * having a specific name.
  */
 struct of_dev_auxdata versatile_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI0_BASE, "fpga:05", &mmc0_plat_data),
+        OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI0_BASE, "fpga:05", NULL),
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_KMI0_BASE, "fpga:06", NULL),
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_KMI1_BASE, "fpga:07", NULL),
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART3_BASE, "fpga:09", NULL),
-        /* FIXME: this is buggy, the platform data is needed for this MMC instance too */
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI1_BASE, "fpga:0b", NULL),
 
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_CLCD_BASE, "dev:20", &clcd_plat_data),
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART0_BASE, "dev:f1", NULL),
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART1_BASE, "dev:f2", NULL),
         OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART2_BASE, "dev:f3", NULL),
-        OF_DEV_AUXDATA("arm,primecell", VERSATILE_SSP_BASE, "dev:f4", &ssp0_plat_data),
+        OF_DEV_AUXDATA("arm,primecell", VERSATILE_SSP_BASE, "dev:f4", NULL),
 
 #if 0
         /*
@@ -720,19 +745,6 @@ static void versatile_leds_event(led_event_t ledevt)
 }
 #endif  /* CONFIG_LEDS */
 
-void versatile_restart(char mode, const char *cmd)
-{
-        void __iomem *sys = __io_address(VERSATILE_SYS_BASE);
-        u32 val;
-
-        val = __raw_readl(sys + VERSATILE_SYS_RESETCTL_OFFSET);
-        val |= 0x105;
-
-        __raw_writel(0xa05f, sys + VERSATILE_SYS_LOCK_OFFSET);
-        __raw_writel(val, sys + VERSATILE_SYS_RESETCTL_OFFSET);
-        __raw_writel(0, sys + VERSATILE_SYS_LOCK_OFFSET);
-}
-
 /* Early initializations */
 void __init versatile_init_early(void)
 {
@@ -757,6 +769,10 @@ void __init versatile_init(void)
                 struct amba_device *d = amba_devs[i];
                 amba_device_register(d, &iomem_resource);
         }
+
+#ifdef CONFIG_LEDS
+        leds_event = versatile_leds_event;
+#endif
 }
 
 /*
diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h
index 683e60776a8..e01422700eb 100644
--- a/arch/arm/mach-versatile/core.h
+++ b/arch/arm/mach-versatile/core.h
@@ -30,16 +30,25 @@ extern void __init versatile_init_early(void);
 extern void __init versatile_init_irq(void);
 extern void __init versatile_map_io(void);
 extern struct sys_timer versatile_timer;
-extern void versatile_restart(char, const char *);
 extern unsigned int mmc_status(struct device *dev);
 #ifdef CONFIG_OF
 extern struct of_dev_auxdata versatile_auxdata_lookup[];
 #endif
 
-#define APB_DEVICE(name, busid, base, plat)     \
-static AMBA_APB_DEVICE(name, busid, 0, VERSATILE_##base##_BASE, base##_IRQ, plat)
-
-#define AHB_DEVICE(name, busid, base, plat)     \
-static AMBA_AHB_DEVICE(name, busid, 0, VERSATILE_##base##_BASE, base##_IRQ, plat)
+#define AMBA_DEVICE(name,busid,base,plat)                       \
+static struct amba_device name##_device = {                     \
+        .dev            = {                                     \
+                .coherent_dma_mask = ~0,                        \
+                .init_name = busid,                             \
+                .platform_data = plat,                          \
+        },                                                      \
+        .res            = {                                     \
+                .start  = VERSATILE_##base##_BASE,              \
+                .end    = (VERSATILE_##base##_BASE) + SZ_4K - 1,\
+                .flags  = IORESOURCE_MEM,                       \
+        },                                                      \
+        .dma_mask       = ~0,                                   \
+        .irq            = base##_IRQ,                           \
+}
 
 #endif
diff --git a/arch/arm/mach-versatile/include/mach/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S
index d0fbd7f1cb0..eb2cf7dc5c4 100644
--- a/arch/arm/mach-versatile/include/mach/debug-macro.S
+++ b/arch/arm/mach-versatile/include/mach/debug-macro.S
@@ -11,7 +11,7 @@
  *
 */
 
-                .macro  addruart, rp, rv, tmp
+                .macro  addruart, rp, rv
                 mov     \rp,      #0x001F0000
                 orr     \rp, \rp, #0x00001000
                 orr     \rv, \rp, #0xf1000000   @ virtual base
diff --git a/arch/arm/mach-versatile/include/mach/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h
index 3e5d425e2a9..4d4973dd8fb 100644
--- a/arch/arm/mach-versatile/include/mach/hardware.h
+++ b/arch/arm/mach-versatile/include/mach/hardware.h
@@ -30,7 +30,7 @@
 #define VERSATILE_PCI_VIRT_BASE         (void __iomem *)0xe8000000ul
 #define VERSATILE_PCI_CFG_VIRT_BASE     (void __iomem *)0xe9000000ul
 
-/* macro to get at MMIO space when running virtually */
+/* macro to get at IO space when running virtually */
 #define IO_ADDRESS(x)           (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
 
 #define __io_address(n)         ((void __iomem __force *)IO_ADDRESS(n))
diff --git a/arch/arm/mach-versatile/include/mach/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h
index 0fd771ca617..bf44c61bd1f 100644
--- a/arch/arm/mach-versatile/include/mach/irqs.h
+++ b/arch/arm/mach-versatile/include/mach/irqs.h
@@ -25,7 +25,7 @@
  *  IRQ interrupts definitions are the same as the INT definitions
  *  held within platform.h
  */
-#define IRQ_VIC_START           32
+#define IRQ_VIC_START           0
 #define IRQ_WDOGINT             (IRQ_VIC_START + INT_WDOGINT)
 #define IRQ_SOFTINT             (IRQ_VIC_START + INT_SOFTINT)
 #define IRQ_COMMRx              (IRQ_VIC_START + INT_COMMRx)
@@ -100,7 +100,7 @@
 /*
  * Secondary interrupt controller
  */
-#define IRQ_SIC_START           64
+#define IRQ_SIC_START           32
 #define IRQ_SIC_MMCI0B          (IRQ_SIC_START + SIC_INT_MMCI0B)
 #define IRQ_SIC_MMCI1B          (IRQ_SIC_START + SIC_INT_MMCI1B)
 #define IRQ_SIC_KMI0            (IRQ_SIC_START + SIC_INT_KMI0)
@@ -120,7 +120,7 @@
 #define IRQ_SIC_PCI1            (IRQ_SIC_START + SIC_INT_PCI1)
 #define IRQ_SIC_PCI2            (IRQ_SIC_START + SIC_INT_PCI2)
 #define IRQ_SIC_PCI3            (IRQ_SIC_START + SIC_INT_PCI3)
-#define IRQ_SIC_END             95
+#define IRQ_SIC_END             63
 
 #define IRQ_GPIO0_START         (IRQ_SIC_END + 1)
 #define IRQ_GPIO0_END           (IRQ_GPIO0_START + 31)
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index 2f84f4094f1..c898deb3ada 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -24,6 +24,7 @@
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
+#include <asm/system.h>
 #include <asm/mach/pci.h>
 
 /*
@@ -173,7 +174,7 @@ static struct resource io_mem = {
         .name   = "PCI I/O space",
         .start  = VERSATILE_PCI_MEM_BASE0,
         .end    = VERSATILE_PCI_MEM_BASE0+VERSATILE_PCI_MEM_BASE0_SIZE-1,
-        .flags  = IORESOURCE_MEM,
+        .flags  = IORESOURCE_IO,
 };
 
 static struct resource non_mem = {
@@ -190,7 +191,7 @@ static struct resource pre_mem = {
         .flags  = IORESOURCE_MEM | IORESOURCE_PREFETCH,
 };
 
-static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
+static int __init pci_versatile_setup_resources(struct resource **resource)
 {
         int ret = 0;
 
@@ -214,11 +215,13 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
         }
 
         /*
-         * the mem resource for this bus
-         * the prefetch mem resource for this bus
+         * bus->resource[0] is the IO resource for this bus
+         * bus->resource[1] is the mem resource for this bus
+         * bus->resource[2] is the prefetch mem resource for this bus
          */
-        pci_add_resource_offset(&sys->resources, &non_mem, sys->mem_offset);
-        pci_add_resource_offset(&sys->resources, &pre_mem, sys->mem_offset);
+        resource[0] = &io_mem;
+        resource[1] = &non_mem;
+        resource[2] = &pre_mem;
 
         goto out;
 
@@ -245,12 +248,9 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
                 goto out;
         }
 
-        ret = pci_ioremap_io(0, VERSATILE_PCI_MEM_BASE0);
-        if (ret)
-                goto out;
-
         if (nr == 0) {
-                ret = pci_versatile_setup_resources(sys);
+                sys->mem_offset = 0;
+                ret = pci_versatile_setup_resources(sys->resource);
                 if (ret < 0) {
                         printk("pci_versatile_setup: resources... oops?\n");
                         goto out;
@@ -304,8 +304,14 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
 }
 
 
+struct pci_bus * __init pci_versatile_scan_bus(int nr, struct pci_sys_data *sys)
+{
+        return pci_scan_bus(sys->busnr, &pci_versatile_ops, sys);
+}
+
 void __init pci_versatile_preinit(void)
 {
+        pcibios_min_io = 0x44000000;
         pcibios_min_mem = 0x50000000;
 
         __raw_writel(VERSATILE_PCI_MEM_BASE0 >> 28, PCI_IMAP0);
@@ -325,6 +331,7 @@ void __init pci_versatile_preinit(void)
 static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
         int irq;
+        int devslot = PCI_SLOT(dev->devfn);
 
         /* slot,  pin,  irq
          *  24     1     27
@@ -332,16 +339,19 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
          *  26     1     29
          *  27     1     30
          */
-        irq = 27 + ((slot - 24 + pin - 1) & 3);
+        irq = 27 + ((slot + pin - 1) & 3);
+
+        printk("PCI map irq: slot %d, pin %d, devslot %d, irq: %d\n",slot,pin,devslot,irq);
 
         return irq;
 }
 
 static struct hw_pci versatile_pci __initdata = {
+        .swizzle                = NULL,
         .map_irq                = versatile_map_irq,
         .nr_controllers         = 1,
-        .ops                    = &pci_versatile_ops,
         .setup                  = pci_versatile_setup,
+        .scan                   = pci_versatile_scan_bus,
         .preinit                = pci_versatile_preinit,
 };
 
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index 98f65493177..f8ae64b3eed 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -21,12 +21,12 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
@@ -35,12 +35,10 @@
 
 MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
         /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        .atag_offset    = 0x100,
+        .boot_params    = 0x00000100,
         .map_io         = versatile_map_io,
         .init_early     = versatile_init_early,
         .init_irq       = versatile_init_irq,
-        .handle_irq     = vic_handle_irq,
         .timer          = &versatile_timer,
         .init_machine   = versatile_init,
-        .restart        = versatile_restart,
 MACHINE_END
diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
index ae5ad3c8f3d..54e037c090f 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
+++ b/arch/arm/mach-versatile/versatile_dt.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
@@ -46,9 +45,7 @@ DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)")
         .map_io         = versatile_map_io,
         .init_early     = versatile_init_early,
         .init_irq       = versatile_init_irq,
-        .handle_irq     = vic_handle_irq,
         .timer          = &versatile_timer,
         .init_machine   = versatile_dt_init,
         .dt_compat      = versatile_dt_match,
-        .restart        = versatile_restart,
 MACHINE_END
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 19738331bd3..37c23dfeefb 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -21,13 +21,13 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/hardware/vic.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
@@ -58,28 +58,28 @@ static struct pl061_platform_data gpio3_plat_data = {
         .irq_base       = IRQ_GPIO3_START,
 };
 
-#define UART3_IRQ       { IRQ_SIC_UART3 }
-#define SCI1_IRQ        { IRQ_SIC_SCI3 }
+#define UART3_IRQ       { IRQ_SIC_UART3, NO_IRQ }
+#define SCI1_IRQ        { IRQ_SIC_SCI3, NO_IRQ }
 #define MMCI1_IRQ       { IRQ_MMCI1A, IRQ_SIC_MMCI1B }
 
 /*
  * These devices are connected via the core APB bridge
  */
-#define GPIO2_IRQ       { IRQ_GPIOINT2 }
-#define GPIO3_IRQ       { IRQ_GPIOINT3 }
+#define GPIO2_IRQ       { IRQ_GPIOINT2, NO_IRQ }
+#define GPIO3_IRQ       { IRQ_GPIOINT3, NO_IRQ }
 
 /*
  * These devices are connected via the DMA APB bridge
  */
 
 /* FPGA Primecells */
-APB_DEVICE(uart3, "fpga:09", UART3,    NULL);
-APB_DEVICE(sci1,  "fpga:0a", SCI1,     NULL);
-APB_DEVICE(mmc1,  "fpga:0b", MMCI1,    &mmc1_plat_data);
+AMBA_DEVICE(uart3, "fpga:09", UART3,    NULL);
+AMBA_DEVICE(sci1,  "fpga:0a", SCI1,     NULL);
+AMBA_DEVICE(mmc1,  "fpga:0b", MMCI1,    &mmc1_plat_data);
 
 /* DevChip Primecells */
-APB_DEVICE(gpio2, "dev:e6",  GPIO2,    &gpio2_plat_data);
-APB_DEVICE(gpio3, "dev:e7",  GPIO3,    &gpio3_plat_data);
+AMBA_DEVICE(gpio2, "dev:e6",  GPIO2,    &gpio2_plat_data);
+AMBA_DEVICE(gpio3, "dev:e7",  GPIO3,    &gpio3_plat_data);
 
 static struct amba_device *amba_devs[] __initdata = {
         &uart3_device,
@@ -103,12 +103,10 @@ static void __init versatile_pb_init(void)
 
 MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
         /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        .atag_offset    = 0x100,
+        .boot_params    = 0x00000100,
         .map_io         = versatile_map_io,
         .init_early     = versatile_init_early,
         .init_irq       = versatile_init_irq,
-        .handle_irq     = vic_handle_irq,
         .timer          = &versatile_timer,
         .init_machine   = versatile_pb_init,
-        .restart        = versatile_restart,
 MACHINE_END