1 files changed, 32 insertions, 6 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 5aeadfd72143..15261646dcdd 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -76,16 +76,42 @@ static struct map_desc ebsa110_io_desc[] __initdata = {
        /*
         * sparse external-decode ISAIO space
         */
-        { IRQ_STAT,    TRICK4_PHYS, PGDIR_SIZE,  MT_DEVICE }, /* IRQ_STAT/IRQ_MCLR */
+        {       /* IRQ_STAT/IRQ_MCLR */
-        { IRQ_MASK,    TRICK3_PHYS, PGDIR_SIZE,  MT_DEVICE }, /* IRQ_MASK/IRQ_MSET */
+                .virtual        = IRQ_STAT,
-        { SOFT_BASE,   TRICK1_PHYS, PGDIR_SIZE,  MT_DEVICE }, /* SOFT_BASE */
+                .pfn            = __phys_to_pfn(TRICK4_PHYS),
-        { PIT_BASE,    TRICK0_PHYS, PGDIR_SIZE,  MT_DEVICE }, /* PIT_BASE */
+                .length         = PGDIR_SIZE,
+                .type           = MT_DEVICE
+        }, {    /* IRQ_MASK/IRQ_MSET */
+                .virtual        = IRQ_MASK,
+                .pfn            = __phys_to_pfn(TRICK3_PHYS),
+                .length         = PGDIR_SIZE,
+                .type           = MT_DEVICE
+        }, {    /* SOFT_BASE */
+                .virtual        = SOFT_BASE,
+                .pfn            = __phys_to_pfn(TRICK1_PHYS),
+                .length         = PGDIR_SIZE,
+                .type           = MT_DEVICE
+        }, {    /* PIT_BASE */
+                .virtual        = PIT_BASE,
+                .pfn            = __phys_to_pfn(TRICK0_PHYS),
+                .length         = PGDIR_SIZE,
+                .type           = MT_DEVICE
+        },
        /*
         * self-decode ISAIO space
         */
-        { ISAIO_BASE,  ISAIO_PHYS,  ISAIO_SIZE,  MT_DEVICE },
+        {
-        { ISAMEM_BASE, ISAMEM_PHYS, ISAMEM_SIZE, MT_DEVICE }
+                .virtual        = ISAIO_BASE,
+                .pfn            = __phys_to_pfn(ISAIO_PHYS),
+                .length         = ISAIO_SIZE,
+                .type           = MT_DEVICE
+        }, {
+                .virtual        = ISAMEM_BASE,
+                .pfn            = __phys_to_pfn(ISAMEM_PHYS),
+                .length         = ISAMEM_SIZE,
+                .type           = MT_DEVICE
+        }
 };
 static void __init ebsa110_map_io(void)

diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 5aeadfd72143..15261646dcdd 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c
@@ -76,16 +76,42 @@ static struct map_desc ebsa110_io_desc[] __initdata = {
76	/*	76	/*
77	* sparse external-decode ISAIO space	77	* sparse external-decode ISAIO space
78	*/	78	*/
79	{ IRQ_STAT, TRICK4_PHYS, PGDIR_SIZE, MT_DEVICE }, /* IRQ_STAT/IRQ_MCLR */	79	{ /* IRQ_STAT/IRQ_MCLR */
80	{ IRQ_MASK, TRICK3_PHYS, PGDIR_SIZE, MT_DEVICE }, /* IRQ_MASK/IRQ_MSET */	80	.virtual = IRQ_STAT,
81	{ SOFT_BASE, TRICK1_PHYS, PGDIR_SIZE, MT_DEVICE }, /* SOFT_BASE */	81	.pfn = __phys_to_pfn(TRICK4_PHYS),
82	{ PIT_BASE, TRICK0_PHYS, PGDIR_SIZE, MT_DEVICE }, /* PIT_BASE */	82	.length = PGDIR_SIZE,
		83	.type = MT_DEVICE
		84	}, { /* IRQ_MASK/IRQ_MSET */
		85	.virtual = IRQ_MASK,
		86	.pfn = __phys_to_pfn(TRICK3_PHYS),
		87	.length = PGDIR_SIZE,
		88	.type = MT_DEVICE
		89	}, { /* SOFT_BASE */
		90	.virtual = SOFT_BASE,
		91	.pfn = __phys_to_pfn(TRICK1_PHYS),
		92	.length = PGDIR_SIZE,
		93	.type = MT_DEVICE
		94	}, { /* PIT_BASE */
		95	.virtual = PIT_BASE,
		96	.pfn = __phys_to_pfn(TRICK0_PHYS),
		97	.length = PGDIR_SIZE,
		98	.type = MT_DEVICE
		99	},
83		100
84	/*	101	/*
85	* self-decode ISAIO space	102	* self-decode ISAIO space
86	*/	103	*/
87	{ ISAIO_BASE, ISAIO_PHYS, ISAIO_SIZE, MT_DEVICE },	104	{
88	{ ISAMEM_BASE, ISAMEM_PHYS, ISAMEM_SIZE, MT_DEVICE }	105	.virtual = ISAIO_BASE,
		106	.pfn = __phys_to_pfn(ISAIO_PHYS),
		107	.length = ISAIO_SIZE,
		108	.type = MT_DEVICE
		109	}, {
		110	.virtual = ISAMEM_BASE,
		111	.pfn = __phys_to_pfn(ISAMEM_PHYS),
		112	.length = ISAMEM_SIZE,
		113	.type = MT_DEVICE
		114	}
89	};	115	};
90		116
91	static void __init ebsa110_map_io(void)	117	static void __init ebsa110_map_io(void)