2 files changed, 19 insertions, 1 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index b777d8f46bd5..ecc7a02d868e 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -937,7 +937,7 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
 }
 #endif
 
-bool __init early_init_dt_scan(void *params)
+bool __init early_init_dt_verify(void *params)
 {
         if (!params)
                 return false;
@@ -951,6 +951,12 @@ bool __init early_init_dt_scan(void *params)
                 return false;
         }
 
+        return true;
+}
+
+
+void __init early_init_dt_scan_nodes(void)
+{
         /* Retrieve various information from the /chosen node */
         of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line);
 
@@ -959,7 +965,17 @@ bool __init early_init_dt_scan(void *params)
 
         /* Setup memory, calling early_init_dt_add_memory_arch */
         of_scan_flat_dt(early_init_dt_scan_memory, NULL);
+}
+
+bool __init early_init_dt_scan(void *params)
+{
+        bool status;
+
+        status = early_init_dt_verify(params);
+        if (!status)
+                return false;
 
+        early_init_dt_scan_nodes();
         return true;
 }
 
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 05117899fcb4..ebb2449082fb 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -73,6 +73,8 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname,
                                    int depth, void *data);
 
 extern bool early_init_dt_scan(void *params);
+extern bool early_init_dt_verify(void *params);
+extern void early_init_dt_scan_nodes(void);
 
 extern const char *of_flat_dt_get_machine_name(void);
 extern const void *of_flat_dt_match_machine(const void *default_match,