Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] powerpc: fix cell platform detection | Date | Fri, 24 Mar 2006 19:52:53 +0100 |
| |
All future firmware should have 'CBEA' in the compatible property in order to tell us that we are running on the cell platform, so check for that as well as the now deprecated value we have been using so far.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
---
This applies on top of the 'Kill machine numbers' patch from Ben Herrenschmidt.
Index: linus-2.6/arch/powerpc/platforms/cell/setup.c =================================================================== --- linus-2.6.orig/arch/powerpc/platforms/cell/setup.c +++ linus-2.6/arch/powerpc/platforms/cell/setup.c @@ -198,7 +198,14 @@ static void __init cell_init_early(void) static int __init cell_probe(void) { unsigned long root = of_get_flat_dt_root(); - if (!of_flat_dt_is_compatible(root, "IBM,CPB")) + + /* + * CPBW was used on early prototypes and will be removed. + * The correct identification is CBEA. + */ + if (!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0") && + !of_flat_dt_is_compatible(root, "IBM,CBEA") && + !of_flat_dt_is_compatible(root, "CBEA")) return 0; return 1; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |