[PATCH] powerpc: Fix cell blade detection

The IBM Cell blade firmware might confuse the kernel to think it's a
pSeries machine. This fixes it for now. With a bit of luck, the firmware
will be updated to avoid that in the future but currently that patch is
needed.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 6574b22b3cf3..fd3e5609e3e0 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -125,14 +125,13 @@ static void __init cell_init_early(void)
 
 static int __init cell_probe(void)
 {
-        /* XXX This is temporary, the Cell maintainer will come up with
-         * more appropriate detection logic
-         */
         unsigned long root = of_get_flat_dt_root();
-        if (!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
-                return 0;
 
-        return 1;
+        if (of_flat_dt_is_compatible(root, "IBM,CBEA") ||
+            of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
+                return 1;
+
+        return 0;
 }
 
 /*