ARM: clps711x: Reduce static map size

Last CLPS711X CPU register is PLLR has 0xa5a8 address, so we can reduce
the map to 48k and align the end of the static at VMALLOC_START.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/include/debug/clps711x.S b/arch/arm/include/debug/clps711x.S
index abe2254..c17ac5c 100644 (file)
--- a/arch/arm/include/debug/clps711x.S
+++ b/arch/arm/include/debug/clps711x.S
@@ -9,10 +9,10 @@
 
 #ifndef CONFIG_DEBUG_CLPS711X_UART2
 #define CLPS711X_UART_PADDR    (0x80000000 + 0x0000)
-#define CLPS711X_UART_VADDR    (0xfeff0000 + 0x0000)
+#define CLPS711X_UART_VADDR    (0xfeff4000 + 0x0000)
 #else
 #define CLPS711X_UART_PADDR    (0x80000000 + 0x1000)
-#define CLPS711X_UART_VADDR    (0xfeff0000 + 0x1000)
+#define CLPS711X_UART_VADDR    (0xfeff4000 + 0x1000)
 #endif
 
 #define SYSFLG         (0x0140)

diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index 671acc5..6466da8 100644 (file)
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -37,8 +37,8 @@ static struct map_desc clps711x_io_desc[] __initdata = {
        {
                .virtual        = (unsigned long)CLPS711X_VIRT_BASE,
                .pfn            = __phys_to_pfn(CLPS711X_PHYS_BASE),
-               .length         = SZ_64K,
-               .type           = MT_DEVICE
+               .length         = 48 * SZ_1K,
+               .type           = MT_DEVICE,
        }
 };
 

diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 833129c..cfd0e2c 100644 (file)
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -24,7 +24,7 @@
 
 #include <mach/clps711x.h>
 
-#define CLPS711X_VIRT_BASE     IOMEM(0xfeff0000)
+#define CLPS711X_VIRT_BASE     IOMEM(0xfeff4000)
 
 #ifndef __ASSEMBLY__
 #define clps_readb(off)                readb(CLPS711X_VIRT_BASE + (off))