2 files changed, 27 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index efed4bc2b454..ce02c056ac3f 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1125,24 +1125,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
                 tce_alloc_end = *lprop;
 #endif
 
-#ifdef CONFIG_PPC_RTAS
-        /* To help early debugging via the front panel, we retrieve a minimal
-         * set of RTAS infos now if available
-         */
-        {
-                u64 *basep, *entryp, *sizep;
-
-                basep = of_get_flat_dt_prop(node, "linux,rtas-base", NULL);
-                entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL);
-                sizep = of_get_flat_dt_prop(node, "linux,rtas-size", NULL);
-                if (basep && entryp && sizep) {
-                        rtas.base = *basep;
-                        rtas.entry = *entryp;
-                        rtas.size = *sizep;
-                }
-        }
-#endif /* CONFIG_PPC_RTAS */
-
 #ifdef CONFIG_KEXEC
        lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);
        if (lprop)
@@ -1327,6 +1309,11 @@ void __init early_init_devtree(void *params)
         /* Setup flat device-tree pointer */
         initial_boot_params = params;
 
+#ifdef CONFIG_PPC_RTAS
+        /* Some machines might need RTAS info for debugging, grab it now. */
+        of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
+#endif
+
         /* Retrieve various informations from the /chosen node of the
          * device-tree, including the platform type, initrd location and
          * size, TCE reserve, and more ...
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index b6aed765966a..061d8afd246e 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -801,3 +801,25 @@ void __init rtas_initialize(void)
         rtas_last_error_token = rtas_token("rtas-last-error");
 #endif
 }
+
+int __init early_init_dt_scan_rtas(unsigned long node,
+                const char *uname, int depth, void *data)
+{
+        u32 *basep, *entryp, *sizep;
+
+        if (depth != 1 || strcmp(uname, "rtas") != 0)
+                return 0;
+
+        basep  = of_get_flat_dt_prop(node, "linux,rtas-base", NULL);
+        entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL);
+        sizep  = of_get_flat_dt_prop(node, "rtas-size", NULL);
+
+        if (basep && entryp && sizep) {
+                rtas.base = *basep;
+                rtas.entry = *entryp;
+                rtas.size = *sizep;
+        }
+
+        /* break now */
+        return 1;
+}