3 files changed, 2 insertions, 56 deletions
diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91rm9200/at91rm9200.c
index c32d0c996f90..dcf6136fedf9 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200.c
@@ -31,41 +31,6 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
                .length         = SZ_16K,
                .type           = MT_DEVICE,
        }, {
-                .virtual        = AT91_VA_BASE_SSC2,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_SSC2),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_SSC1,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_SSC1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_SSC0,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_SSC0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_US3,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_US3),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_US2,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_US2),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_US1,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_US1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_US0,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_US0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
                .virtual        = AT91_VA_BASE_EMAC,
                .pfn            = __phys_to_pfn(AT91RM9200_BASE_EMAC),
                .length         = SZ_16K,
@@ -86,16 +51,6 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
                .length         = SZ_16K,
                .type           = MT_DEVICE,
        }, {
-                .virtual        = AT91_VA_BASE_TCB1,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_TCB1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_TCB0,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_TCB0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
                .virtual        = AT91_SRAM_VIRT_BASE,
                .pfn            = __phys_to_pfn(AT91RM9200_SRAM_BASE),
                .length         = AT91RM9200_SRAM_SIZE,
diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c
index db7c684cdb63..01525530c287 100644
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
@@ -131,8 +131,8 @@ static struct at91_eth_data eth_data;
 static struct resource at91_eth_resources[] = {
        [0] = {
-                .start  = AT91RM9200_BASE_EMAC,
+                .start  = AT91_VA_BASE_EMAC,
-                .end    = AT91RM9200_BASE_EMAC + SZ_16K - 1,
+                .end    = AT91_VA_BASE_EMAC + SZ_16K - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91rm9200/hardware.h
index 878e65f369bf..6551b4d1ff7b 100644
--- a/include/asm-arm/arch-at91rm9200/hardware.h
+++ b/include/asm-arm/arch-at91rm9200/hardware.h
@@ -35,19 +35,10 @@
 */
 #define AT91_VA_BASE_SYS        AT91_IO_P2V(AT91_BASE_SYS)
 #define AT91_VA_BASE_SPI        AT91_IO_P2V(AT91RM9200_BASE_SPI)
-#define AT91_VA_BASE_SSC2       AT91_IO_P2V(AT91RM9200_BASE_SSC2)
-#define AT91_VA_BASE_SSC1       AT91_IO_P2V(AT91RM9200_BASE_SSC1)
-#define AT91_VA_BASE_SSC0       AT91_IO_P2V(AT91RM9200_BASE_SSC0)
-#define AT91_VA_BASE_US3        AT91_IO_P2V(AT91RM9200_BASE_US3)
-#define AT91_VA_BASE_US2        AT91_IO_P2V(AT91RM9200_BASE_US2)
-#define AT91_VA_BASE_US1        AT91_IO_P2V(AT91RM9200_BASE_US1)
-#define AT91_VA_BASE_US0        AT91_IO_P2V(AT91RM9200_BASE_US0)
 #define AT91_VA_BASE_EMAC       AT91_IO_P2V(AT91RM9200_BASE_EMAC)
 #define AT91_VA_BASE_TWI        AT91_IO_P2V(AT91RM9200_BASE_TWI)
 #define AT91_VA_BASE_MCI        AT91_IO_P2V(AT91RM9200_BASE_MCI)
 #define AT91_VA_BASE_UDP        AT91_IO_P2V(AT91RM9200_BASE_UDP)
-#define AT91_VA_BASE_TCB1       AT91_IO_P2V(AT91RM9200_BASE_TCB1)
-#define AT91_VA_BASE_TCB0       AT91_IO_P2V(AT91RM9200_BASE_TCB0)
 /* Internal SRAM is mapped below the IO devices */
 #define AT91_SRAM_VIRT_BASE     (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE)

diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91rm9200/at91rm9200.c index c32d0c996f90..dcf6136fedf9 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200.c +++ b/arch/arm/mach-at91rm9200/at91rm9200.c
@@ -31,41 +31,6 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
31	.length = SZ_16K,	31	.length = SZ_16K,
32	.type = MT_DEVICE,	32	.type = MT_DEVICE,
33	}, {	33	}, {
34	.virtual = AT91_VA_BASE_SSC2,
35	.pfn = __phys_to_pfn(AT91RM9200_BASE_SSC2),
36	.length = SZ_16K,
37	.type = MT_DEVICE,
38	}, {
39	.virtual = AT91_VA_BASE_SSC1,
40	.pfn = __phys_to_pfn(AT91RM9200_BASE_SSC1),
41	.length = SZ_16K,
42	.type = MT_DEVICE,
43	}, {
44	.virtual = AT91_VA_BASE_SSC0,
45	.pfn = __phys_to_pfn(AT91RM9200_BASE_SSC0),
46	.length = SZ_16K,
47	.type = MT_DEVICE,
48	}, {
49	.virtual = AT91_VA_BASE_US3,
50	.pfn = __phys_to_pfn(AT91RM9200_BASE_US3),
51	.length = SZ_16K,
52	.type = MT_DEVICE,
53	}, {
54	.virtual = AT91_VA_BASE_US2,
55	.pfn = __phys_to_pfn(AT91RM9200_BASE_US2),
56	.length = SZ_16K,
57	.type = MT_DEVICE,
58	}, {
59	.virtual = AT91_VA_BASE_US1,
60	.pfn = __phys_to_pfn(AT91RM9200_BASE_US1),
61	.length = SZ_16K,
62	.type = MT_DEVICE,
63	}, {
64	.virtual = AT91_VA_BASE_US0,
65	.pfn = __phys_to_pfn(AT91RM9200_BASE_US0),
66	.length = SZ_16K,
67	.type = MT_DEVICE,
68	}, {
69	.virtual = AT91_VA_BASE_EMAC,	34	.virtual = AT91_VA_BASE_EMAC,
70	.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),	35	.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),
71	.length = SZ_16K,	36	.length = SZ_16K,
@@ -86,16 +51,6 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
86	.length = SZ_16K,	51	.length = SZ_16K,
87	.type = MT_DEVICE,	52	.type = MT_DEVICE,
88	}, {	53	}, {
89	.virtual = AT91_VA_BASE_TCB1,
90	.pfn = __phys_to_pfn(AT91RM9200_BASE_TCB1),
91	.length = SZ_16K,
92	.type = MT_DEVICE,
93	}, {
94	.virtual = AT91_VA_BASE_TCB0,
95	.pfn = __phys_to_pfn(AT91RM9200_BASE_TCB0),
96	.length = SZ_16K,
97	.type = MT_DEVICE,
98	}, {
99	.virtual = AT91_SRAM_VIRT_BASE,	54	.virtual = AT91_SRAM_VIRT_BASE,
100	.pfn = __phys_to_pfn(AT91RM9200_SRAM_BASE),	55	.pfn = __phys_to_pfn(AT91RM9200_SRAM_BASE),
101	.length = AT91RM9200_SRAM_SIZE,	56	.length = AT91RM9200_SRAM_SIZE,


diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c index db7c684cdb63..01525530c287 100644 --- a/arch/arm/mach-at91rm9200/devices.c +++ b/arch/arm/mach-at91rm9200/devices.c
@@ -131,8 +131,8 @@ static struct at91_eth_data eth_data;
131		131
132	static struct resource at91_eth_resources[] = {	132	static struct resource at91_eth_resources[] = {
133	[0] = {	133	[0] = {
134	.start = AT91RM9200_BASE_EMAC,	134	.start = AT91_VA_BASE_EMAC,
135	.end = AT91RM9200_BASE_EMAC + SZ_16K - 1,	135	.end = AT91_VA_BASE_EMAC + SZ_16K - 1,
136	.flags = IORESOURCE_MEM,	136	.flags = IORESOURCE_MEM,
137	},	137	},
138	[1] = {	138	[1] = {


diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91rm9200/hardware.h index 878e65f369bf..6551b4d1ff7b 100644 --- a/include/asm-arm/arch-at91rm9200/hardware.h +++ b/include/asm-arm/arch-at91rm9200/hardware.h
@@ -35,19 +35,10 @@
35	*/	35	*/
36	#define AT91_VA_BASE_SYS AT91_IO_P2V(AT91_BASE_SYS)	36	#define AT91_VA_BASE_SYS AT91_IO_P2V(AT91_BASE_SYS)
37	#define AT91_VA_BASE_SPI AT91_IO_P2V(AT91RM9200_BASE_SPI)	37	#define AT91_VA_BASE_SPI AT91_IO_P2V(AT91RM9200_BASE_SPI)
38	#define AT91_VA_BASE_SSC2 AT91_IO_P2V(AT91RM9200_BASE_SSC2)
39	#define AT91_VA_BASE_SSC1 AT91_IO_P2V(AT91RM9200_BASE_SSC1)
40	#define AT91_VA_BASE_SSC0 AT91_IO_P2V(AT91RM9200_BASE_SSC0)
41	#define AT91_VA_BASE_US3 AT91_IO_P2V(AT91RM9200_BASE_US3)
42	#define AT91_VA_BASE_US2 AT91_IO_P2V(AT91RM9200_BASE_US2)
43	#define AT91_VA_BASE_US1 AT91_IO_P2V(AT91RM9200_BASE_US1)
44	#define AT91_VA_BASE_US0 AT91_IO_P2V(AT91RM9200_BASE_US0)
45	#define AT91_VA_BASE_EMAC AT91_IO_P2V(AT91RM9200_BASE_EMAC)	38	#define AT91_VA_BASE_EMAC AT91_IO_P2V(AT91RM9200_BASE_EMAC)
46	#define AT91_VA_BASE_TWI AT91_IO_P2V(AT91RM9200_BASE_TWI)	39	#define AT91_VA_BASE_TWI AT91_IO_P2V(AT91RM9200_BASE_TWI)
47	#define AT91_VA_BASE_MCI AT91_IO_P2V(AT91RM9200_BASE_MCI)	40	#define AT91_VA_BASE_MCI AT91_IO_P2V(AT91RM9200_BASE_MCI)
48	#define AT91_VA_BASE_UDP AT91_IO_P2V(AT91RM9200_BASE_UDP)	41	#define AT91_VA_BASE_UDP AT91_IO_P2V(AT91RM9200_BASE_UDP)
49	#define AT91_VA_BASE_TCB1 AT91_IO_P2V(AT91RM9200_BASE_TCB1)
50	#define AT91_VA_BASE_TCB0 AT91_IO_P2V(AT91RM9200_BASE_TCB0)
51		42
52	/* Internal SRAM is mapped below the IO devices */	43	/* Internal SRAM is mapped below the IO devices */
53	#define AT91_SRAM_VIRT_BASE (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE)	44	#define AT91_SRAM_VIRT_BASE (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE)