From bbea06f3efbae5776e6c285fea59fd249eec44ff Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar <santosh.shilimkar@ti.com> Date: Thu, 5 Jun 2014 15:22:52 -0400 Subject: [PATCH] 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> --- arch/arm/mach-keystone/keystone.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index 1f9ae89ee06d1..7f352de260990 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 && -- GitLab