diff options
Diffstat (limited to 'arch/arm/mach-clps711x')
| -rw-r--r-- | arch/arm/mach-clps711x/board-clep7312.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/board-edb7211.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/board-p720t.c | 2 | 
3 files changed, 8 insertions, 11 deletions
diff --git a/arch/arm/mach-clps711x/board-clep7312.c b/arch/arm/mach-clps711x/board-clep7312.c index 221b9de32dd6..94a7add88a3f 100644 --- a/arch/arm/mach-clps711x/board-clep7312.c +++ b/arch/arm/mach-clps711x/board-clep7312.c @@ -18,6 +18,7 @@  #include <linux/init.h>  #include <linux/types.h>  #include <linux/string.h> +#include <linux/memblock.h>  #include <asm/setup.h>  #include <asm/mach-types.h> @@ -26,11 +27,9 @@  #include "common.h"  static void __init -fixup_clep7312(struct tag *tags, char **cmdline, struct meminfo *mi) +fixup_clep7312(struct tag *tags, char **cmdline)  { -	mi->nr_banks=1; -	mi->bank[0].start = 0xc0000000; -	mi->bank[0].size = 0x01000000; +	memblock_add(0xc0000000, 0x01000000);  }  MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c index 077609841f14..f9828f89972a 100644 --- a/arch/arm/mach-clps711x/board-edb7211.c +++ b/arch/arm/mach-clps711x/board-edb7211.c @@ -16,6 +16,7 @@  #include <linux/interrupt.h>  #include <linux/backlight.h>  #include <linux/platform_device.h> +#include <linux/memblock.h>  #include <linux/mtd/physmap.h>  #include <linux/mtd/partitions.h> @@ -133,7 +134,7 @@ static void __init edb7211_reserve(void)  }  static void __init -fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi) +fixup_edb7211(struct tag *tags, char **cmdline)  {  	/*  	 * Bank start addresses are not present in the information @@ -143,11 +144,8 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)  	 * Banks sizes _are_ present in the param block, but we're  	 * not using that information yet.  	 */ -	mi->bank[0].start = 0xc0000000; -	mi->bank[0].size = SZ_8M; -	mi->bank[1].start = 0xc1000000; -	mi->bank[1].size = SZ_8M; -	mi->nr_banks = 2; +	memblock_add(0xc0000000, SZ_8M); +	memblock_add(0xc1000000, SZ_8M);  }  static void __init edb7211_init(void) diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c index 67b733744ed7..0cf0e51e6546 100644 --- a/arch/arm/mach-clps711x/board-p720t.c +++ b/arch/arm/mach-clps711x/board-p720t.c @@ -295,7 +295,7 @@ static struct generic_bl_info p720t_lcd_backlight_pdata = {  };  static void __init -fixup_p720t(struct tag *tag, char **cmdline, struct meminfo *mi) +fixup_p720t(struct tag *tag, char **cmdline)  {  	/*  	 * Our bootloader doesn't setup any tags (yet).  | 
