3 files changed, 18 insertions, 1 deletions

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 060a75e99263..0406cb3f1af7 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -50,6 +50,7 @@ struct machine_desc {
         struct smp_operations   *smp;           /* SMP operations       */
         bool                    (*smp_init)(void);
         void                    (*fixup)(struct tag *, char **);
+        void                    (*dt_fixup)(void);
         void                    (*init_meminfo)(void);
         void                    (*reserve)(void);/* reserve mem blocks  */
         void                    (*map_io)(void);/* IO mapping function  */
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index e94a157ddff1..11c54de9f8cf 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -212,7 +212,7 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
         mdesc_best = &__mach_desc_GENERIC_DT;
 #endif
 
-        if (!dt_phys || !early_init_dt_scan(phys_to_virt(dt_phys)))
+        if (!dt_phys || !early_init_dt_verify(phys_to_virt(dt_phys)))
                 return NULL;
 
         mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
@@ -237,6 +237,12 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
                 dump_machine_table(); /* does not return */
         }
 
+        /* We really don't want to do this, but sometimes firmware provides buggy data */
+        if (mdesc->dt_fixup)
+                mdesc->dt_fixup();
+
+        early_init_dt_scan_nodes();
+
         /* Change machine number to match the mdesc we're using */
         __machine_arch_type = mdesc->nr;
 
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 46d893fcbe85..66c9b9614f3c 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -335,6 +335,15 @@ static void __init exynos_reserve(void)
 #endif
 }
 
+static void __init exynos_dt_fixup(void)
+{
+        /*
+         * Some versions of uboot pass garbage entries in the memory node,
+         * use the old CONFIG_ARM_NR_BANKS
+         */
+        of_fdt_limit_memory(8);
+}
+
 DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)")
         /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */
         /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
@@ -348,4 +357,5 @@ DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)")
         .dt_compat      = exynos_dt_compat,
         .restart        = exynos_restart,
         .reserve        = exynos_reserve,
+        .dt_fixup       = exynos_dt_fixup,
 MACHINE_END