diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2012-07-16 14:21:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 16:24:29 -0400 |
| commit | 3785d2d0f298ed7aaa7acbd76020be2d66827077 (patch) | |
| tree | 3cf8a1006a447c9f6e99b080b80d84dd348d856b | |
| parent | 02d7d6d2b695054687677e474f00d2f24a8be49a (diff) | |
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
This override does not allow support for multiple machines in a single core.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-clps711x/include/mach/memory.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h index 3a032a67725c..fc0e028d9405 100644 --- a/arch/arm/mach-clps711x/include/mach/memory.h +++ b/arch/arm/mach-clps711x/include/mach/memory.h | |||
| @@ -25,26 +25,6 @@ | |||
| 25 | */ | 25 | */ |
| 26 | #define PLAT_PHYS_OFFSET UL(0xc0000000) | 26 | #define PLAT_PHYS_OFFSET UL(0xc0000000) |
| 27 | 27 | ||
| 28 | #if !defined(CONFIG_ARCH_CDB89712) && !defined (CONFIG_ARCH_AUTCPU12) | ||
| 29 | |||
| 30 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET) | ||
| 31 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET) | ||
| 32 | #define __pfn_to_bus(x) (__pfn_to_phys(x) - PHYS_OFFSET) | ||
| 33 | #define __bus_to_pfn(x) __phys_to_pfn((x) + PHYS_OFFSET) | ||
| 34 | |||
| 35 | #endif | ||
| 36 | |||
| 37 | |||
| 38 | /* | ||
| 39 | * Like the SA1100, the EDB7211 has a large gap between physical RAM | ||
| 40 | * banks. In 2.2, the Psion (CL-PS7110) port added custom support for | ||
| 41 | * discontiguous physical memory. In 2.4, we can use the standard | ||
| 42 | * Linux NUMA support. | ||
| 43 | * | ||
| 44 | * This is not necessary for EP7211 implementations with only one used | ||
| 45 | * memory bank. For those systems, simply undefine CONFIG_DISCONTIGMEM. | ||
| 46 | */ | ||
| 47 | |||
| 48 | /* | 28 | /* |
| 49 | * The PS7211 allows up to 256MB max per DRAM bank, but the EDB7211 | 29 | * The PS7211 allows up to 256MB max per DRAM bank, but the EDB7211 |
| 50 | * uses only one of the two banks (bank #1). However, even within | 30 | * uses only one of the two banks (bank #1). However, even within |
| @@ -54,23 +34,6 @@ | |||
| 54 | * them, so we use 24 for the node max shift to get 16MB node sizes. | 34 | * them, so we use 24 for the node max shift to get 16MB node sizes. |
| 55 | */ | 35 | */ |
| 56 | 36 | ||
| 57 | /* | ||
| 58 | * Because of the wide memory address space between physical RAM banks on the | ||
| 59 | * SA1100, it's much more convenient to use Linux's NUMA support to implement | ||
| 60 | * our memory map representation. Assuming all memory nodes have equal access | ||
| 61 | * characteristics, we then have generic discontiguous memory support. | ||
| 62 | * | ||
| 63 | * Of course, all this isn't mandatory for SA1100 implementations with only | ||
| 64 | * one used memory bank. For those, simply undefine CONFIG_DISCONTIGMEM. | ||
| 65 | * | ||
| 66 | * The nodes are matched with the physical memory bank addresses which are | ||
| 67 | * incidentally the same as virtual addresses. | ||
| 68 | * | ||
| 69 | * node 0: 0xc0000000 - 0xc7ffffff | ||
| 70 | * node 1: 0xc8000000 - 0xcfffffff | ||
| 71 | * node 2: 0xd0000000 - 0xd7ffffff | ||
| 72 | * node 3: 0xd8000000 - 0xdfffffff | ||
| 73 | */ | ||
| 74 | #define SECTION_SIZE_BITS 24 | 37 | #define SECTION_SIZE_BITS 24 |
| 75 | #define MAX_PHYSMEM_BITS 32 | 38 | #define MAX_PHYSMEM_BITS 32 |
| 76 | 39 | ||