1 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91rm9200/at91rm9200.c
index 0816a8d2e863..a92e9a495b07 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200.c
@@ -28,32 +28,12 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
                .length         = SZ_4K,
                .type           = MT_DEVICE,
        }, {
-                .virtual        = AT91_VA_BASE_SPI,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_SPI),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
                .virtual        = AT91_VA_BASE_EMAC,
                .pfn            = __phys_to_pfn(AT91RM9200_BASE_EMAC),
                .length         = SZ_16K,
                .type           = MT_DEVICE,
        }, {
-                .virtual        = AT91_VA_BASE_TWI,
+                .virtual        = AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_TWI),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_MCI,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_MCI),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_UDP,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_UDP),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_SRAM_VIRT_BASE,
                .pfn            = __phys_to_pfn(AT91RM9200_SRAM_BASE),
                .length         = AT91RM9200_SRAM_SIZE,
                .type           = MT_DEVICE,

diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91rm9200/at91rm9200.c index 0816a8d2e863..a92e9a495b07 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200.c +++ b/arch/arm/mach-at91rm9200/at91rm9200.c
@@ -28,32 +28,12 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
28	.length = SZ_4K,	28	.length = SZ_4K,
29	.type = MT_DEVICE,	29	.type = MT_DEVICE,
30	}, {	30	}, {
31	.virtual = AT91_VA_BASE_SPI,
32	.pfn = __phys_to_pfn(AT91RM9200_BASE_SPI),
33	.length = SZ_16K,
34	.type = MT_DEVICE,
35	}, {
36	.virtual = AT91_VA_BASE_EMAC,	31	.virtual = AT91_VA_BASE_EMAC,
37	.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),	32	.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),
38	.length = SZ_16K,	33	.length = SZ_16K,
39	.type = MT_DEVICE,	34	.type = MT_DEVICE,
40	}, {	35	}, {
41	.virtual = AT91_VA_BASE_TWI,	36	.virtual = AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE,
42	.pfn = __phys_to_pfn(AT91RM9200_BASE_TWI),
43	.length = SZ_16K,
44	.type = MT_DEVICE,
45	}, {
46	.virtual = AT91_VA_BASE_MCI,
47	.pfn = __phys_to_pfn(AT91RM9200_BASE_MCI),
48	.length = SZ_16K,
49	.type = MT_DEVICE,
50	}, {
51	.virtual = AT91_VA_BASE_UDP,
52	.pfn = __phys_to_pfn(AT91RM9200_BASE_UDP),
53	.length = SZ_16K,
54	.type = MT_DEVICE,
55	}, {
56	.virtual = AT91_SRAM_VIRT_BASE,
57	.pfn = __phys_to_pfn(AT91RM9200_SRAM_BASE),	37	.pfn = __phys_to_pfn(AT91RM9200_SRAM_BASE),
58	.length = AT91RM9200_SRAM_SIZE,	38	.length = AT91RM9200_SRAM_SIZE,
59	.type = MT_DEVICE,	39	.type = MT_DEVICE,