Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-clps7500 / core.c

diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index e216ab8b9e8f7c048a83d057c7af36d7575b6826..92eaebdd56061455fdfbb812e6b5cc3f4d861f57 100644 (file)
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -9,6 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/init.h>
@@ -259,10 +260,27 @@ static void __init clps7500_init_irq(void)
 }
 
 static struct map_desc cl7500_io_desc[] __initdata = {
-       { IO_BASE,      IO_START,       IO_SIZE,    MT_DEVICE },        /* IO space     */
-       { ISA_BASE,     ISA_START,      ISA_SIZE,   MT_DEVICE },        /* ISA space    */
-       { FLASH_BASE,   FLASH_START,    FLASH_SIZE, MT_DEVICE },        /* Flash        */
-       { LED_BASE,     LED_START,      LED_SIZE,   MT_DEVICE }         /* LED          */
+       {       /* IO space     */
+               .virtual        = (unsigned long)IO_BASE,
+               .pfn            = __phys_to_pfn(IO_START),
+               .length         = IO_SIZE,
+               .type           = MT_DEVICE
+       }, {    /* ISA space    */
+               .virtual        = ISA_BASE,
+               .pfn            = __phys_to_pfn(ISA_START),
+               .length         = ISA_SIZE,
+               .type           = MT_DEVICE
+       }, {    /* Flash        */
+               .virtual        = FLASH_BASE,
+               .pfn            = __phys_to_pfn(FLASH_START),
+               .length         = FLASH_SIZE,
+               .type           = MT_DEVICE
+       }, {    /* LED          */
+               .virtual        = LED_BASE,
+               .pfn            = __phys_to_pfn(LED_START),
+               .length         = LED_SIZE,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init clps7500_map_io(void)
@@ -298,7 +316,7 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction clps7500_timer_irq = {
        .name           = "CLPS7500 Timer Tick",
-       .flags          = SA_INTERRUPT | SA_TIMER,
+       .flags          = IRQF_DISABLED | IRQF_TIMER,
        .handler        = clps7500_timer_interrupt,
 };
 
@@ -367,7 +385,6 @@ static void __init clps7500_init(void)
 
 MACHINE_START(CLPS7500, "CL-PS7500")
        /* Maintainer: Philip Blundell */
-       .phys_ram       = 0x10000000,
        .phys_io        = 0x03000000,
        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
        .map_io         = clps7500_map_io,