diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-04 13:07:14 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 18:26:55 -0500 |
commit | f4117ac9e237b74afdf5e001d5ea26a4d15e9847 (patch) | |
tree | dce3ccceda23d4bf620ec3d025a14773c7c938a8 /arch/arm/mach-davinci/include | |
parent | 6fc31d54443bdc25a8166be15e3920a7e39d195d (diff) |
ARM: P2V: separate PHYS_OFFSET from platform definitions
This uncouple PHYS_OFFSET from the platform definitions, thereby
facilitating run-time computation of the physical memory offset.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Magnus Damm <damm@opensource.se>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Jiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-davinci/include')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index 22eb97c1c30b..78822723f382 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h | |||
@@ -26,9 +26,9 @@ | |||
26 | #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) | 26 | #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) |
27 | #error Cannot enable DaVinci and DA8XX platforms concurrently | 27 | #error Cannot enable DaVinci and DA8XX platforms concurrently |
28 | #elif defined(CONFIG_ARCH_DAVINCI_DA8XX) | 28 | #elif defined(CONFIG_ARCH_DAVINCI_DA8XX) |
29 | #define PHYS_OFFSET DA8XX_DDR_BASE | 29 | #define PLAT_PHYS_OFFSET DA8XX_DDR_BASE |
30 | #else | 30 | #else |
31 | #define PHYS_OFFSET DAVINCI_DDR_BASE | 31 | #define PLAT_PHYS_OFFSET DAVINCI_DDR_BASE |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #define DDR2_SDRCR_OFFSET 0xc | 34 | #define DDR2_SDRCR_OFFSET 0xc |