aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-orion
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-02-07 21:55:45 +0100
committerNicolas Pitre <nico@cam.org>2008-02-08 11:52:23 -0500
commit8c42da46f3b0ff85ac4f61beaa0633bbb480c49e (patch)
tree1d275d544900294bb39831fc753a9fdb00dd7d7c /include/asm-arm/arch-orion
parent[ARM] Orion: distinguish between physical and virtual addresses (diff)
downloadlinux-dev-8c42da46f3b0ff85ac4f61beaa0633bbb480c49e.tar.xz
linux-dev-8c42da46f3b0ff85ac4f61beaa0633bbb480c49e.zip
[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>
Diffstat (limited to 'include/asm-arm/arch-orion')
-rw-r--r--include/asm-arm/arch-orion/orion.h16
-rw-r--r--include/asm-arm/arch-orion/vmalloc.h2
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 @@
* Orion Address Map
*
* virt phys size
- * f0000000 f0000000 16M PCIe WA space (Orion-NAS only)
- * f1000000 f1000000 1M on-chip peripheral registers
- * f2000000 f2000000 1M PCIe I/O space
- * f2100000 f2100000 1M PCI I/O space
+ * fdd00000 f1000000 1M on-chip peripheral registers
+ * fde00000 f2000000 1M PCIe I/O space
+ * fdf00000 f2100000 1M PCI I/O space
+ * fe000000 f0000000 16M PCIe WA space (Orion-NAS only)
****************************************************************************/
#define ORION_REGS_PHYS_BASE 0xf1000000
-#define ORION_REGS_VIRT_BASE 0xf1000000
+#define ORION_REGS_VIRT_BASE 0xfdd00000
#define ORION_REGS_SIZE SZ_1M
#define ORION_PCIE_IO_PHYS_BASE 0xf2000000
-#define ORION_PCIE_IO_VIRT_BASE 0xf2000000
+#define ORION_PCIE_IO_VIRT_BASE 0xfde00000
#define ORION_PCIE_IO_BUS_BASE 0x00000000
#define ORION_PCIE_IO_SIZE SZ_1M
#define ORION_PCI_IO_PHYS_BASE 0xf2100000
-#define ORION_PCI_IO_VIRT_BASE 0xf2100000
+#define ORION_PCI_IO_VIRT_BASE 0xfdf00000
#define ORION_PCI_IO_BUS_BASE 0x00100000
#define ORION_PCI_IO_SIZE SZ_1M
/* Relevant only for Orion-NAS */
#define ORION_PCIE_WA_PHYS_BASE 0xf0000000
-#define ORION_PCIE_WA_VIRT_BASE 0xf0000000
+#define ORION_PCIE_WA_VIRT_BASE 0xfe000000
#define ORION_PCIE_WA_SIZE SZ_16M
#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 @@
* include/asm-arm/arch-orion/vmalloc.h
*/
-#define VMALLOC_END 0xf0000000
+#define VMALLOC_END 0xfd800000