From b2086e01418535d8156ec82cc74edeec7a44a468 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Fri, 1 Jul 2011 18:59:51 +0800
Subject: [PATCH] rk29: change IO memory map / VMALLOC_END, better support 1G
 memory

---
 arch/arm/mach-rk29/include/mach/memory.h     |  8 +++---
 arch/arm/mach-rk29/include/mach/rk29_iomap.h | 27 +++++++++++++-------
 arch/arm/mach-rk29/include/mach/vmalloc.h    |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/arch/arm/mach-rk29/include/mach/memory.h b/arch/arm/mach-rk29/include/mach/memory.h
index b634bcda6369..d9f2d2c03c52 100644
--- a/arch/arm/mach-rk29/include/mach/memory.h
+++ b/arch/arm/mach-rk29/include/mach/memory.h
@@ -24,10 +24,10 @@
 /*
  * SRAM memory whereabouts
  */
-#define SRAM_CODE_OFFSET	0xff400000
-#define SRAM_CODE_END		0xff401fff
-#define SRAM_DATA_OFFSET	0xff402000
-#define SRAM_DATA_END		0xff403fff
+#define SRAM_CODE_OFFSET	0xFEF00000
+#define SRAM_CODE_END		0xFEF01FFF
+#define SRAM_DATA_OFFSET	0xFEF02000
+#define SRAM_DATA_END		0xFEF03FFF
 
 #endif
 
diff --git a/arch/arm/mach-rk29/include/mach/rk29_iomap.h b/arch/arm/mach-rk29/include/mach/rk29_iomap.h
index d2166053d2cf..ec6aaf7cb54e 100755
--- a/arch/arm/mach-rk29/include/mach/rk29_iomap.h
+++ b/arch/arm/mach-rk29/include/mach/rk29_iomap.h
@@ -18,16 +18,24 @@
 
 #include <asm/sizes.h>
 
-/* defines */
-#define		SZ_22K				0x5800
-/*IOÓ³É䷽ʽ¶¨Ò壬ÒÔÎïÀíµØÖ·0x20000000Ϊ»ùµØÖ·
- *ºÍÒÔ0x10000000Ϊ»ùµØÖ··ÖÁíÓ³ÉäΪ£º0xf5000000,
- *0xf4000000
+/*
+ * RK29 IO memory map:
+ *
+ * Virt         Phys            Size    What
+ * ---------------------------------------------------------------------------
+ *              10000000        1M      CPU L1 AXI Interconnect
+ * FEA00000     10100000        1200K
+ *              10300000        1M      Peri AXI Interconnect
+ * FEC00000     10500000        16K     NANDC
+ *              11000000        1M      SMC Bank0
+ *              12000000        1M      SMC Bank1
+ *              15000000        1M      CPU L2 AXI Interconnect
+ * FED00000     20000000        640K    APB
+ * FEF00000     0               16K     SRAM
  */
- 
 
-#define RK29_ADDR_BASE1 			0xF5000000  
-#define RK29_ADDR_BASE0 			0xF4000000
+#define RK29_ADDR_BASE0				0xFEA00000
+#define RK29_ADDR_BASE1				0xFED00000
 
 #define RK29_SDRAM_PHYS				0x60000000U
 #define RK29_AXI1_PHYS				0x10000000	
@@ -94,8 +102,9 @@
 #define RK29_ARBITER1_PHYS			0x10228000
 #define RK29_ARBITER1_SIZE          SZ_16K
 #define RK29_PERI_AXI_BUS0_PHYS		0x10300000
+
 #define RK29_NANDC_PHYS				0x10500000
-#define RK29_NANDC_BASE				(RK29_ADDR_BASE0+0x500000)
+#define RK29_NANDC_BASE				0xFEC00000
 #define RK29_NANDC_SIZE				SZ_16K
 
 //CPU AXI 1 APB
diff --git a/arch/arm/mach-rk29/include/mach/vmalloc.h b/arch/arm/mach-rk29/include/mach/vmalloc.h
index 4cb70007b120..9f48e31d1ce6 100644
--- a/arch/arm/mach-rk29/include/mach/vmalloc.h
+++ b/arch/arm/mach-rk29/include/mach/vmalloc.h
@@ -16,7 +16,7 @@
 #ifndef __ASM_ARCH_RK29_VMALLOC_H
 #define __ASM_ARCH_RK29_VMALLOC_H
 
-#define VMALLOC_END	0xF0000000
+#define VMALLOC_END	0xFE800000
 
 #endif
 
-- 
2.34.1