Commit e7ae8d17 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: replace add_memory_region with memblock 



add_memory_region was the old interface for registering memory and
was already changed to used memblock internaly. Replace it by
directly calling memblock functions.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 73826d60

arch/mips/alchemy/common/prom.c

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/sizes.h>

#include <linux/string.h>
@@ -93,7 +94,7 @@ void __init prom_init(void) 
	if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))

		memsize = SZ_64M; /* minimum memsize is 64MB RAM */



	add_memory_region(0, memsize, BOOT_MEM_RAM);

	memblock_add(0, memsize);

}



static inline unsigned char str2hexnum(unsigned char c)

arch/mips/ar7/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void __init prom_meminit(void) 
	unsigned long pages;



	pages = memsize() >> PAGE_SHIFT;

	add_memory_region(PHYS_OFFSET, pages << PAGE_SHIFT, BOOT_MEM_RAM);

	memblock_add(PHYS_OFFSET, pages << PAGE_SHIFT);

}



void __init prom_free_prom_memory(void)

arch/mips/ath25/ar2315.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/bitops.h>

#include <linux/irqdomain.h>

#include <linux/interrupt.h>

#include <linux/memblock.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>

#include <asm/bootinfo.h>
@@ -266,7 +267,7 @@ void __init ar2315_plat_mem_setup(void) 
	memsize <<= 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_COL_WIDTH);

	memsize <<= 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_ROW_WIDTH);

	memsize <<= 3;

	add_memory_region(0, memsize, BOOT_MEM_RAM);

	memblock_add(0, memsize);

	iounmap(sdram_base);



	ar2315_rst_base = ioremap(AR2315_RST_BASE, AR2315_RST_SIZE);

arch/mips/ath25/ar5312.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/bitops.h>

#include <linux/irqdomain.h>

#include <linux/interrupt.h>

#include <linux/memblock.h>

#include <linux/platform_device.h>

#include <linux/mtd/physmap.h>

#include <linux/reboot.h>
@@ -363,7 +364,7 @@ void __init ar5312_plat_mem_setup(void) 
	memsize = (bank0_ac ? (1 << (bank0_ac + 1)) : 0) +

		  (bank1_ac ? (1 << (bank1_ac + 1)) : 0);

	memsize <<= 20;

	add_memory_region(0, memsize, BOOT_MEM_RAM);

	memblock_add(0, memsize);

	iounmap(sdram_base);



	ar5312_rst_base = ioremap(AR5312_RST_BASE, AR5312_RST_SIZE);

arch/mips/bcm47xx/prom.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/spinlock.h>

#include <linux/ssb/ssb_driver_chipcommon.h>

#include <linux/ssb/ssb_regs.h>
@@ -97,7 +98,7 @@ static __init void prom_init_mem(void) 
	 */

	if (c->cputype == CPU_74K && (mem == (128  << 20)))

		mem -= 0x1000;

	add_memory_region(0, mem, BOOT_MEM_RAM);

	memblock_add(0, mem);

}



/*