[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>

diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h
index 4a8025466a33ee142df56e6c81ce6087a703a0d7..673a418a741998e3576e4cf587dd6f149c98ec00 100644 (file)
--- 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 23e2a102fe0cd94e0258d65ec01fbbf62dfd7ce7..9d580278d2bc2517c11ab2f13faab0715de8b406 100644 (file)
--- 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