diff options
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/dram_sun6i.c | 15 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/dram.h | 29 |
2 files changed, 30 insertions, 14 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun6i.c b/arch/arm/cpu/armv7/sunxi/dram_sun6i.c index 05f8e7638f..31b7dd50a9 100644 --- a/arch/arm/cpu/armv7/sunxi/dram_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/dram_sun6i.c @@ -326,20 +326,6 @@ static void mctl_port_cfg(void) writel(0x00000307, &mctl_com->mbagcr[5]); } -static bool mctl_mem_matches(u32 offset) -{ - const int match_count = 64; - int i, matches = 0; - - for (i = 0; i < match_count; i++) { - if (readl(CONFIG_SYS_SDRAM_BASE + i * 4) == - readl(CONFIG_SYS_SDRAM_BASE + offset + i * 4)) - matches++; - } - - return matches == match_count; -} - unsigned long sunxi_dram_init(void) { struct sunxi_mctl_com_reg * const mctl_com = @@ -391,6 +377,7 @@ unsigned long sunxi_dram_init(void) MCTL_CR_BANK(1) | MCTL_CR_RANK(1)); /* Detect and set page size */ + mctl_mem_fill(); for (columns = 7; columns < 20; columns++) { if (mctl_mem_matches(1 << columns)) break; diff --git a/arch/arm/include/asm/arch-sunxi/dram.h b/arch/arm/include/asm/arch-sunxi/dram.h index 18924f5c9c..0bf718c3a4 100644 --- a/arch/arm/include/asm/arch-sunxi/dram.h +++ b/arch/arm/include/asm/arch-sunxi/dram.h @@ -22,6 +22,8 @@ #include <asm/arch/dram_sun4i.h> #endif +#define MCTL_MEM_FILL_MATCH_COUNT 64 + unsigned long sunxi_dram_init(void); /* @@ -37,4 +39,31 @@ static inline void mctl_await_completion(u32 *reg, u32 mask, u32 val) } } +/* + * Fill beginning of DRAM with "random" data for mctl_mem_matches() + */ +static inline void mctl_mem_fill(void) +{ + int i; + + for (i = 0; i < MCTL_MEM_FILL_MATCH_COUNT; i++) + writel(0xaa55aa55 + i, CONFIG_SYS_SDRAM_BASE + i * 4); +} + +/* + * Test if memory at offset offset matches memory at begin of DRAM + */ +static inline bool mctl_mem_matches(u32 offset) +{ + int i, matches = 0; + + for (i = 0; i < MCTL_MEM_FILL_MATCH_COUNT; i++) { + if (readl(CONFIG_SYS_SDRAM_BASE + i * 4) == + readl(CONFIG_SYS_SDRAM_BASE + offset + i * 4)) + matches++; + } + + return matches == MCTL_MEM_FILL_MATCH_COUNT; +} + #endif /* _SUNXI_DRAM_H */ |
