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)
+ * fdd00000     f1000000        1M      on-chip peripheral registers
- * f1000000     f1000000        1M      on-chip peripheral registers
+ * fde00000     f2000000        1M      PCIe I/O space
- * f2000000     f2000000        1M      PCIe I/O space
+ * fdf00000     f2100000        1M      PCI I/O space
- * f2100000     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

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