Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-msm / board-trout.c

diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 015d544aa01791ae811e45f581bb63ad347fec0e..f72b07de215276a6f87804e27a1ad8e5cbddcdec 100644 (file)
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/clkdev.h>
+#include <linux/memblock.h>
 
 #include <asm/system_info.h>
 #include <asm/mach-types.h>
@@ -55,12 +56,9 @@ static void __init trout_init_irq(void)
        msm_init_irq();
 }
 
-static void __init trout_fixup(struct tag *tags, char **cmdline,
-                              struct meminfo *mi)
+static void __init trout_fixup(struct tag *tags, char **cmdline)
 {
-       mi->nr_banks = 1;
-       mi->bank[0].start = PHYS_OFFSET;
-       mi->bank[0].size = (101*1024*1024);
+       memblock_add(PHYS_OFFSET, 101*SZ_1M);
 }
 
 static void __init trout_init(void)
@@ -78,7 +76,7 @@ static void __init trout_init(void)
 
 static struct map_desc trout_io_desc[] __initdata = {
        {
-               .virtual = TROUT_CPLD_BASE,
+               .virtual = (unsigned long)TROUT_CPLD_BASE,
                .pfn     = __phys_to_pfn(TROUT_CPLD_START),
                .length  = TROUT_CPLD_SIZE,
                .type    = MT_DEVICE_NONSHARED