diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-02-07 15:55:45 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2008-02-08 11:52:23 -0500 |
| commit | 8c42da46f3b0ff85ac4f61beaa0633bbb480c49e (patch) | |
| tree | 1d275d544900294bb39831fc753a9fdb00dd7d7c | |
| parent | 7f74c2c7f760fdd44116e3dd90a5aeeb9d9333c7 (diff) | |
[ARM] Orion: free up kernel virtual address space
Move Orion virtual mappings higher up in the address space, to free
up more kernel virtual address space.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
| -rw-r--r-- | include/asm-arm/arch-orion/orion.h | 16 | ||||
| -rw-r--r-- | include/asm-arm/arch-orion/vmalloc.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h index 4a8025466a33..673a418a7419 100644 --- a/include/asm-arm/arch-orion/orion.h +++ b/include/asm-arm/arch-orion/orion.h | |||
| @@ -18,28 +18,28 @@ | |||
| 18 | * Orion Address Map | 18 | * Orion Address Map |
| 19 | * | 19 | * |
| 20 | * virt phys size | 20 | * virt phys size |
| 21 | * f0000000 f0000000 16M PCIe WA space (Orion-NAS only) | 21 | * fdd00000 f1000000 1M on-chip peripheral registers |
| 22 | * f1000000 f1000000 1M on-chip peripheral registers | 22 | * fde00000 f2000000 1M PCIe I/O space |
| 23 | * f2000000 f2000000 1M PCIe I/O space | 23 | * fdf00000 f2100000 1M PCI I/O space |
| 24 | * f2100000 f2100000 1M PCI I/O space | 24 | * fe000000 f0000000 16M PCIe WA space (Orion-NAS only) |
| 25 | ****************************************************************************/ | 25 | ****************************************************************************/ |
| 26 | #define ORION_REGS_PHYS_BASE 0xf1000000 | 26 | #define ORION_REGS_PHYS_BASE 0xf1000000 |
| 27 | #define ORION_REGS_VIRT_BASE 0xf1000000 | 27 | #define ORION_REGS_VIRT_BASE 0xfdd00000 |
| 28 | #define ORION_REGS_SIZE SZ_1M | 28 | #define ORION_REGS_SIZE SZ_1M |
| 29 | 29 | ||
| 30 | #define ORION_PCIE_IO_PHYS_BASE 0xf2000000 | 30 | #define ORION_PCIE_IO_PHYS_BASE 0xf2000000 |
| 31 | #define ORION_PCIE_IO_VIRT_BASE 0xf2000000 | 31 | #define ORION_PCIE_IO_VIRT_BASE 0xfde00000 |
| 32 | #define ORION_PCIE_IO_BUS_BASE 0x00000000 | 32 | #define ORION_PCIE_IO_BUS_BASE 0x00000000 |
| 33 | #define ORION_PCIE_IO_SIZE SZ_1M | 33 | #define ORION_PCIE_IO_SIZE SZ_1M |
| 34 | 34 | ||
| 35 | #define ORION_PCI_IO_PHYS_BASE 0xf2100000 | 35 | #define ORION_PCI_IO_PHYS_BASE 0xf2100000 |
| 36 | #define ORION_PCI_IO_VIRT_BASE 0xf2100000 | 36 | #define ORION_PCI_IO_VIRT_BASE 0xfdf00000 |
| 37 | #define ORION_PCI_IO_BUS_BASE 0x00100000 | 37 | #define ORION_PCI_IO_BUS_BASE 0x00100000 |
| 38 | #define ORION_PCI_IO_SIZE SZ_1M | 38 | #define ORION_PCI_IO_SIZE SZ_1M |
| 39 | 39 | ||
| 40 | /* Relevant only for Orion-NAS */ | 40 | /* Relevant only for Orion-NAS */ |
| 41 | #define ORION_PCIE_WA_PHYS_BASE 0xf0000000 | 41 | #define ORION_PCIE_WA_PHYS_BASE 0xf0000000 |
| 42 | #define ORION_PCIE_WA_VIRT_BASE 0xf0000000 | 42 | #define ORION_PCIE_WA_VIRT_BASE 0xfe000000 |
| 43 | #define ORION_PCIE_WA_SIZE SZ_16M | 43 | #define ORION_PCIE_WA_SIZE SZ_16M |
| 44 | 44 | ||
| 45 | #define ORION_PCIE_MEM_PHYS_BASE 0xe0000000 | 45 | #define ORION_PCIE_MEM_PHYS_BASE 0xe0000000 |
diff --git a/include/asm-arm/arch-orion/vmalloc.h b/include/asm-arm/arch-orion/vmalloc.h index 23e2a102fe0c..9d580278d2bc 100644 --- a/include/asm-arm/arch-orion/vmalloc.h +++ b/include/asm-arm/arch-orion/vmalloc.h | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | * include/asm-arm/arch-orion/vmalloc.h | 2 | * include/asm-arm/arch-orion/vmalloc.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #define VMALLOC_END 0xf0000000 | 5 | #define VMALLOC_END 0xfd800000 |