From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932602AbWCXSxN (ORCPT ); Fri, 24 Mar 2006 13:53:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932599AbWCXSxM (ORCPT ); Fri, 24 Mar 2006 13:53:12 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:20955 "EHLO e4.ny.us.ibm.com") by vger.kernel.org with ESMTP id S932598AbWCXSxI (ORCPT ); Fri, 24 Mar 2006 13:53:08 -0500 From: Arnd Bergmann Organization: IBM Deutschland Entwicklung GmbH To: linuxppc-dev@ozlabs.org Subject: [PATCH] powerpc: fix cell platform detection Date: Fri, 24 Mar 2006 19:52:53 +0100 User-Agent: KMail/1.9.1 Cc: Paul Mackerras , Linux Kernel list , cbe-oss-dev@ozlabs.org References: <1143178947.4257.78.camel@localhost.localdomain> <1143187298.3710.3.camel@localhost.localdomain> <200603240946.51793.arnd@arndb.de> In-Reply-To: <200603240946.51793.arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603241952.54126.arnd.bergmann@de.ibm.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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;