[SPARC64]: Detect sun4v early in boot process.

[linux-2.6-omap-h63xx.git] / arch / sparc64 / prom / init.c

diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c
index f3cc2d8578b200ec8cc140dc4661abfebfea67a8..095755e428a687782963f041e9fffd4f01293d10 100644 (file)
--- a/arch/sparc64/prom/init.c
+++ b/arch/sparc64/prom/init.c
@@ -18,7 +18,6 @@ enum prom_major_version prom_vers;
 unsigned int prom_rev, prom_prev;
 
 /* The root node of the prom device tree. */
-int prom_root_node;
 int prom_stdin, prom_stdout;
 int prom_chosen_node;
 
@@ -41,26 +40,22 @@ void __init prom_init(void *cif_handler, void *cif_stack)
 
        prom_cif_init(cif_handler, cif_stack);
 
-       prom_root_node = prom_getsibling(0);
-       if((prom_root_node == 0) || (prom_root_node == -1))
-               prom_halt();
-
        prom_chosen_node = prom_finddevice(prom_chosen_path);
        if (!prom_chosen_node || prom_chosen_node == -1)
                prom_halt();
 
-       prom_stdin = prom_getint (prom_chosen_node, "stdin");
-       prom_stdout = prom_getint (prom_chosen_node, "stdout");
+       prom_stdin = prom_getint(prom_chosen_node, "stdin");
+       prom_stdout = prom_getint(prom_chosen_node, "stdout");
 
        node = prom_finddevice("/openprom");
        if (!node || node == -1)
                prom_halt();
 
-       prom_getstring (node, "version", buffer, sizeof (buffer));
+       prom_getstring(node, "version", buffer, sizeof (buffer));
 
-       prom_printf ("\n");
+       prom_printf("\n");
 
-       if (strncmp (buffer, "OBP ", 4))
+       if (strncmp(buffer, "OBP ", 4))
                goto strange_version;
 
        /*
@@ -70,7 +65,7 @@ void __init prom_init(void *cif_handler, void *cif_stack)
         * accordingly. -spot
         */
 
-       if (strncmp (buffer, "OBP  ", 5))
+       if (strncmp(buffer, "OBP  ", 5))
                bufadjust = 4;
        else
                bufadjust = 5;
@@ -87,7 +82,8 @@ void __init prom_init(void *cif_handler, void *cif_stack)
        prom_rev = ints[1];
        prom_prev = (ints[0] << 16) | (ints[1] << 8) | ints[2];
 
-       printk ("PROMLIB: Sun IEEE Boot Prom %s\n", buffer + bufadjust);
+       printk("PROMLIB: Sun IEEE Boot Prom %s\n", buffer + bufadjust);
+       printk("PROMLIB: Root node compatible: %s\n", prom_root_compatible);
 
        /* Initialization successful. */
        return;