From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway-1237.mvista.com (gateway-1237.mvista.com [63.81.120.158]) by ozlabs.org (Postfix) with ESMTP id BB9D3DDF02 for ; Tue, 12 Feb 2008 07:59:51 +1100 (EST) Date: Mon, 11 Feb 2008 13:32:43 -0700 From: Dave Jiang To: galak@kernel.crashing.org, linuxppc-dev@ozlabs.org Subject: [PATCH 1/2] powerpc: publish 85xx soc dts entries as of_device Message-ID: <20080211203243.GA5331@blade.az.mvista.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Publish the devices listed in dts under SOC as of_device just like what mpc85xx_mds platforms do. The 85xx cds and ads platforms currently do not export the devices in dts as of_device. The memory controller, L2 cache-controller, and the PCI controller(s) are published as of_device so the mpc85xx EDAC driver can claim them for usage. Signed-off-by: Dave Jiang --- commit 187841bf9dff25e4ac1a7174daa55bb036c724b1 tree 3206ffbbfc5075d195345281f72f7b52f060b41b parent a99824f327c748b2753f4fa570eb1fefcd6a9c4d author Dave Jiang Mon, 11 Feb 2008 12:51:33 -0700 committer Dave Jiang Mon, 11 Feb 2008 12:51:33 -0700 arch/powerpc/platforms/85xx/mpc85xx_ads.c | 19 +++++++++++++++++++ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) mpc85xx EDAC driver is in mainline kernel now diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 4e03050..024393c 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include @@ -249,6 +251,23 @@ static int __init mpc85xx_ads_probe(void) return of_flat_dt_is_compatible(root, "MPC85xxADS"); } +static struct of_device_id mpc85xx_ids[] = { + { .type = "soc", }, + { .compatible = "soc", }, + {}, +}; + +static int __init mpc85xx_publish_devices(void) +{ + if (!machine_is(mpc85xx_ads)) + return 0; + + of_platform_bus_probe(NULL, mpc85xx_ids, NULL); + + return 0; +} +device_initcall(mpc85xx_publish_devices); + define_machine(mpc85xx_ads) { .name = "MPC85xx ADS", .probe = mpc85xx_ads_probe, diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index 8b1de78..8525882 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include @@ -335,6 +337,23 @@ static int __init mpc85xx_cds_probe(void) return of_flat_dt_is_compatible(root, "MPC85xxCDS"); } +static struct of_device_id mpc85xx_ids[] = { + { .type = "soc", }, + { .compatible = "soc", }, + {}, +}; + +static int __init mpc85xx_publish_devices(void) +{ + if (!machine_is(mpc85xx_cds)) + return 0; + + of_platform_bus_probe(NULL, mpc85xx_ids, NULL); + + return 0; +} +device_initcall(mpc85xx_publish_devices); + define_machine(mpc85xx_cds) { .name = "MPC85xx CDS", .probe = mpc85xx_cds_probe,