Merge branch 'x86/spinlocks' into x86/xen

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp23xx / roadrunner.c

diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c
index 43c14e740794b47078fa53e5a50517c9edadebdb..896ff9f840d9af4565291dc5aa295b6d16be5864 100644 (file)
--- a/arch/arm/mach-ixp23xx/roadrunner.c
+++ b/arch/arm/mach-ixp23xx/roadrunner.c
@@ -14,7 +14,6 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
@@ -24,7 +23,6 @@
 #include <linux/tty.h>
 #include <linux/bitops.h>
 #include <linux/ioport.h>
-#include <linux/serial.h>
 #include <linux/serial_8250.h>
 #include <linux/serial_core.h>
 #include <linux/device.h>
@@ -45,7 +43,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/irq.h>
 #include <asm/mach/pci.h>
 
 /*
@@ -111,10 +108,10 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
        return NO_IRQ;
 }
 
-static void roadrunner_pci_preinit(void)
+static void __init roadrunner_pci_preinit(void)
 {
-       set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW);
-       set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW);
+       set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+       set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
 
        ixp23xx_pci_preinit();
 }
@@ -137,9 +134,29 @@ static int __init roadrunner_pci_init(void)
 
 subsys_initcall(roadrunner_pci_init);
 
+static struct physmap_flash_data roadrunner_flash_data = {
+       .width          = 2,
+};
+
+static struct resource roadrunner_flash_resource = {
+       .start          = 0x90000000,
+       .end            = 0x93ffffff,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device roadrunner_flash = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &roadrunner_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &roadrunner_flash_resource,
+};
+
 static void __init roadrunner_init(void)
 {
-       physmap_configure(0x90000000, 0x04000000, 2, NULL);
+       platform_device_register(&roadrunner_flash);
 
        /*
         * Mark flash as writeable