1 files changed, 36 insertions, 8 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 1d7677669a76..2e9e1702c4b3 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -92,14 +92,42 @@ EXPORT_SYMBOL(pxa_set_cken);
 *         and cache flush area.
 */
 static struct map_desc standard_io_desc[] __initdata = {
- /* virtual     physical    length      type */
+        {       /* Devs */
-  { 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */
+                .virtual        =  0xf2000000,
-  { 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */
+                .pfn            = __phys_to_pfn(0x40000000),
-  { 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */
+                .length         = 0x02000000,
-  { 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */
+                .type           = MT_DEVICE
-  { 0xfa000000, 0x50000000, 0x00100000, MT_DEVICE }, /* Camera */
+        }, {    /* LCD */
-  { 0xfe000000, 0x58000000, 0x00100000, MT_DEVICE }, /* IMem ctl */
+                .virtual        =  0xf4000000,
-  { 0xff000000, 0x00000000, 0x00100000, MT_DEVICE }  /* UNCACHED_PHYS_0 */
+                .pfn            = __phys_to_pfn(0x44000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* Mem Ctl */
+                .virtual        =  0xf6000000,
+                .pfn            = __phys_to_pfn(0x48000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* USB host */
+                .virtual        =  0xf8000000,
+                .pfn            = __phys_to_pfn(0x4c000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* Camera */
+                .virtual        =  0xfa000000,
+                .pfn            = __phys_to_pfn(0x50000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* IMem ctl */
+                .virtual        =  0xfe000000,
+                .pfn            = __phys_to_pfn(0x58000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* UNCACHED_PHYS_0 */
+                .virtual        = 0xff000000,
+                .pfn            = __phys_to_pfn(0x00000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }
 };
 void __init pxa_map_io(void)

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 1d7677669a76..2e9e1702c4b3 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c
@@ -92,14 +92,42 @@ EXPORT_SYMBOL(pxa_set_cken);
92	* and cache flush area.	92	* and cache flush area.
93	*/	93	*/
94	static struct map_desc standard_io_desc[] __initdata = {	94	static struct map_desc standard_io_desc[] __initdata = {
95	/* virtual physical length type */	95	{ /* Devs */
96	{ 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */	96	.virtual = 0xf2000000,
97	{ 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */	97	.pfn = __phys_to_pfn(0x40000000),
98	{ 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */	98	.length = 0x02000000,
99	{ 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */	99	.type = MT_DEVICE
100	{ 0xfa000000, 0x50000000, 0x00100000, MT_DEVICE }, /* Camera */	100	}, { /* LCD */
101	{ 0xfe000000, 0x58000000, 0x00100000, MT_DEVICE }, /* IMem ctl */	101	.virtual = 0xf4000000,
102	{ 0xff000000, 0x00000000, 0x00100000, MT_DEVICE } /* UNCACHED_PHYS_0 */	102	.pfn = __phys_to_pfn(0x44000000),
		103	.length = 0x00100000,
		104	.type = MT_DEVICE
		105	}, { /* Mem Ctl */
		106	.virtual = 0xf6000000,
		107	.pfn = __phys_to_pfn(0x48000000),
		108	.length = 0x00100000,
		109	.type = MT_DEVICE
		110	}, { /* USB host */
		111	.virtual = 0xf8000000,
		112	.pfn = __phys_to_pfn(0x4c000000),
		113	.length = 0x00100000,
		114	.type = MT_DEVICE
		115	}, { /* Camera */
		116	.virtual = 0xfa000000,
		117	.pfn = __phys_to_pfn(0x50000000),
		118	.length = 0x00100000,
		119	.type = MT_DEVICE
		120	}, { /* IMem ctl */
		121	.virtual = 0xfe000000,
		122	.pfn = __phys_to_pfn(0x58000000),
		123	.length = 0x00100000,
		124	.type = MT_DEVICE
		125	}, { /* UNCACHED_PHYS_0 */
		126	.virtual = 0xff000000,
		127	.pfn = __phys_to_pfn(0x00000000),
		128	.length = 0x00100000,
		129	.type = MT_DEVICE
		130	}
103	};	131	};
104		132
105	void __init pxa_map_io(void)	133	void __init pxa_map_io(void)