summaryrefslogtreecommitdiff
path: root/arch/arm/mach-realview/include/mach/memory.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-realview/include/mach/memory.h')
-rw-r--r--arch/arm/mach-realview/include/mach/memory.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index 0e673483a141..554b79bd3e6b 100644
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -23,7 +23,11 @@
/*
* Physical DRAM offset.
*/
+#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
+#define PHYS_OFFSET UL(0x70000000)
+#else
#define PHYS_OFFSET UL(0x00000000)
+#endif
/*
* Virtual view <-> DMA view memory address translations
@@ -32,7 +36,7 @@
* bus_to_virt: Used to convert an address for DMA operations
* to an address that the kernel can use.
*/
-#define __virt_to_bus(x) ((x) - PAGE_OFFSET)
-#define __bus_to_virt(x) ((x) + PAGE_OFFSET)
+#define __virt_to_bus(x) __virt_to_phys(x)
+#define __bus_to_virt(x) __phys_to_virt(x)
#endif