diff options
-rw-r--r-- | arch/mips/bcm63xx/cpu.c | 6 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c index 80941687b9dd..8f0d6c7725ea 100644 --- a/arch/mips/bcm63xx/cpu.c +++ b/arch/mips/bcm63xx/cpu.c | |||
@@ -170,8 +170,10 @@ static unsigned int detect_memory_size(void) | |||
170 | unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0; | 170 | unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0; |
171 | u32 val; | 171 | u32 val; |
172 | 172 | ||
173 | if (BCMCPU_IS_6345()) | 173 | if (BCMCPU_IS_6345()) { |
174 | return (8 * 1024 * 1024); | 174 | val = bcm_sdram_readl(SDRAM_MBASE_REG); |
175 | return (val * 8 * 1024 * 1024); | ||
176 | } | ||
175 | 177 | ||
176 | if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) { | 178 | if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) { |
177 | val = bcm_sdram_readl(SDRAM_CFG_REG); | 179 | val = bcm_sdram_readl(SDRAM_CFG_REG); |
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h index 50057507c4e7..6c9940fb7b71 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | |||
@@ -895,6 +895,8 @@ | |||
895 | #define SDRAM_CFG_BANK_SHIFT 13 | 895 | #define SDRAM_CFG_BANK_SHIFT 13 |
896 | #define SDRAM_CFG_BANK_MASK (1 << SDRAM_CFG_BANK_SHIFT) | 896 | #define SDRAM_CFG_BANK_MASK (1 << SDRAM_CFG_BANK_SHIFT) |
897 | 897 | ||
898 | #define SDRAM_MBASE_REG 0xc | ||
899 | |||
898 | #define SDRAM_PRIO_REG 0x2C | 900 | #define SDRAM_PRIO_REG 0x2C |
899 | #define SDRAM_PRIO_MIPS_SHIFT 29 | 901 | #define SDRAM_PRIO_MIPS_SHIFT 29 |
900 | #define SDRAM_PRIO_MIPS_MASK (1 << SDRAM_PRIO_MIPS_SHIFT) | 902 | #define SDRAM_PRIO_MIPS_MASK (1 << SDRAM_PRIO_MIPS_SHIFT) |