aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel/setup.c
diff options
context:
space:
mode:
authorSonic Zhang <sonic.zhang@analog.com>2012-05-15 01:04:24 -0400
committerBob Liu <lliubbo@gmail.com>2012-05-21 02:54:57 -0400
commit8bf7135fff46f6ac28baf28a8e4144f685b456a0 (patch)
treef769648ea45a40a73775baad38c2756ca2176e73 /arch/blackfin/kernel/setup.c
parent5a84775e999a5579e10f7297776c71b0be2ebd74 (diff)
blackfin: bf60x: Rename the DDR controller macro
Rename the DDR controller macro from DDR0 to DMC0 to avoid confustion for bf60x. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
-rw-r--r--arch/blackfin/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index d0246de347cf..0053e1bc0c6a 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -856,7 +856,7 @@ static inline int __init get_mem_size(void)
856 ret *= 2; 856 ret *= 2;
857 return ret; 857 return ret;
858#elif defined(CONFIG_BF60x) 858#elif defined(CONFIG_BF60x)
859 u32 ddrctl = bfin_read_DDR0_CFG(); 859 u32 ddrctl = bfin_read_DMC0_CFG();
860 int ret; 860 int ret;
861 switch (ddrctl & 0xf00) { 861 switch (ddrctl & 0xf00) {
862 case DEVSZ_64: 862 case DEVSZ_64: