aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2008-04-25 04:31:23 +0800
committerBryan Wu <cooloney@kernel.org>2008-04-25 04:31:23 +0800
commit1e78042c77dcc255abd456398981549269c63238 (patch)
treef35d050ea3b789306ed932f9f58a9dbf8a1f067d /arch
parent5d750b9e4f6ca7d366b4954517ff8be9ee07e1bf (diff)
[Blackfin] arch: take DDR DEVWD into consideration as well for BF548
Pointed-out-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/kernel/setup.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index b0ae5cd4420..8efea004aec 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -680,13 +680,20 @@ static inline int __init get_mem_size(void)
return EBSZ_TO_MEG(bfin_read_EBIU_SDBCTL());
# endif
# elif defined(EBIU_DDRCTL1)
- switch (bfin_read_EBIU_DDRCTL1() & 0xc0000) {
- case DEVSZ_64: return 64 / 8;
- case DEVSZ_128: return 128 / 8;
- case DEVSZ_256: return 256 / 8;
- case DEVSZ_512: return 512 / 8;
- default: return 0;
+ u32 ddrctl = bfin_read_EBIU_DDRCTL1();
+ int ret = 0;
+ switch (ddrctl & 0xc0000) {
+ case DEVSZ_64: ret = 64 / 8;
+ case DEVSZ_128: ret = 128 / 8;
+ case DEVSZ_256: ret = 256 / 8;
+ case DEVSZ_512: ret = 512 / 8;
+ }
+ switch (ddrctl & 0x30000) {
+ case DEVWD_4: ret *= 2;
+ case DEVWD_8: ret *= 2;
+ case DEVWD_16: break;
}
+ return ret;
# endif
#endif
BUG();