[ARM] 3960/1: AT91: Final SAM9 intergration patches.

This patch includes a number of small changes for integrating the
AT91SAM9261 and AT91SAM0260 support.

      * Can only select support for one AT91 processor at a time.
      * Remove most of the remaining static memory mapping for the
        AT91RM9200.
      * Reserve 1Mb of memory below the IO for mapping the internal SRAM
        and any custom board-specific devices (ie, FPGA).
      * The SAM9260 has more serial ports, so increase the maximum to 7.
      * Define the standard chipselect addresses, and define other
        addresses relative to those.
      * CLOCK_TICK_RATE is different on the SAM926x's.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

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,
-                .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,
+                .virtual        = AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE,
                 .pfn            = __phys_to_pfn(AT91RM9200_SRAM_BASE),
                 .length         = AT91RM9200_SRAM_SIZE,
                 .type           = MT_DEVICE,