summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2014-06-05 15:22:52 -0400
committerArnd Bergmann <arnd@arndb.de>2014-06-05 22:20:54 +0200
commitbbea06f3efbae5776e6c285fea59fd249eec44ff (patch)
tree95eb19d5c065c4fed8bd99197e4f9c2e14365e26
parent06fde1a014611a7902a874330d10e530312ceaef (diff)
ARM: keystone: Drop use of meminfo since its not available anymore
Laura's series removed the meminfo structure and its no longer available. Update keystone code to remove the usage of it. Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-keystone/keystone.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 1f9ae89ee06d..7f352de26099 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/of_address.h>
+#include <linux/memblock.h>
#include <asm/setup.h>
#include <asm/mach/map.h>
@@ -68,9 +69,8 @@ static void __init keystone_init_meminfo(void)
phys_addr_t offset = PHYS_OFFSET - KEYSTONE_LOW_PHYS_START;
phys_addr_t mem_start, mem_end;
- BUG_ON(meminfo.nr_banks < 1);
- mem_start = meminfo.bank[0].start;
- mem_end = mem_start + meminfo.bank[0].size - 1;
+ mem_start = memblock_start_of_DRAM();
+ mem_end = memblock_end_of_DRAM();
/* nothing to do if we are running out of the <32-bit space */
if (mem_start >= KEYSTONE_LOW_PHYS_START &&