powerpc: publish 85xx soc dts entries as of_device
Subsystems (2)
PATCH 1/2 powerpc: publish 85xx soc dts entries as of_device
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.
---
commit 187841bf9dff25e4ac1a7174daa55bb036c724b1
tree 3206ffbbfc5075d195345281f72f7b52f060b41b
parent a99824f327c748b2753f4fa570eb1fefcd6a9c4d
author Dave Jiang <[email protected]> Mon, 11 Feb 2008 12:51:33 -0700 committer Dave Jiang <djiang@blade.(none)> 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
arch/powerpc/platforms/85xx/mpc85xx_ads.c +19 -0
@@ -26,6 +26,8 @@#include <asm/mpic.h> #include <mm/mmu_decl.h> #include <asm/udbg.h> +#include <asm/of_device.h> +#include <asm/of_platform.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
@@ -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,
arch/powerpc/platforms/85xx/mpc85xx_cds.c +19 -0
@@ -42,6 +42,8 @@#include <asm/udbg.h> #include <asm/mpic.h> #include <asm/i8259.h> +#include <asm/of_device.h> +#include <asm/of_platform.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
@@ -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,
arch/powerpc/platforms/85xx/mpc85xx_ads.c line 30
Quoted 10 lines · Dave Jiang
arch/powerpc/platforms/85xx/mpc85xx_ads.c +2
-0@@ -26,6 +26,8 @@#include <asm/mpic.h> #include <mm/mmu_decl.h> #include <asm/udbg.h> +#include <asm/of_device.h> +#include <asm/of_platform.h>
Please use <linux/of_{device,platform}.h> throughout instead.
Thanks.
jdl
Quoted 45 lines · Dave Jiang
Publish the devices listed in dts under SOC as
of_devicejust like whatmpc85xx_mdsplatforms do. The 85xx cds and ads platforms currently do not export the devices in dts asof_device.The memory controller, L2 cache-controller, and the PCI controller(s) are published as
of_deviceso the mpc85xx EDAC driver can claim them for usage.Signed-off-by Dave Jiang <[email protected]>---
commit187841bf9dff25e4ac1a7174daa55bb036c724b1
tree3206ffbbfc5075d195345281f72f7b52f060b41b
parenta99824f327c748b2753f4fa570eb1fefcd6a9c4d
author Dave Jiang <[email protected]> Mon, 11 Feb 2008 12:51:33 -0700 committer Dave Jiang <djiang@blade.(none)> Mon, 11 Feb 2008 12:51:33 -0700arch/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
arch/powerpc/platforms/85xx/mpc85xx_ads.c +8
-0@@ -26,6 +26,8 @@#include <asm/mpic.h> #include <mm/mmu_decl.h> #include <asm/udbg.h> +#include <asm/of_device.h> +#include <asm/of_platform.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> @@ -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" , }, + {}, +}; +
arch/powerpc/platforms/85xx/mpc85xx_ads.c static int __init mpc85xx_ads_probe(void) · line 269
Quoted 10 lines
arch/powerpc/platforms/85xx/mpc85xx_ads.c +10
-0+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);
machine_device_initcall() please. (which lets you eliminate the machine_is() test).
arch/powerpc/platforms/85xx/mpc85xx_ads.c static int __init mpc85xx_ads_probe(void)
Quoted 12 lines
arch/powerpc/platforms/85xx/mpc85xx_ads.c +12
-0+ +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); +
ditto
Cheers,
g.
Signature · 2 lines
Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
Hi Dave,
arch/powerpc/platforms/85xx/mpc85xx_ads.c line 30
Quoted 8 lines · On Mon, 11 Feb 2008 13:32:43 -0700 Dave Jiang <[email protected]> wrote:
+++
b/arch/powerpc/platforms/85xx/mpc85xx_ads.carch/powerpc/platforms/85xx/mpc85xx_ads.c +2
-0@@ -26,6 +26,8 @@#include <asm/mpic.h> #include <mm/mmu_decl.h> #include <asm/udbg.h> +#include <asm/of_device.h> +#include <asm/of_platform.h>
Like Jon said ...
Review line 31
Quoted 1 line
(quoted diff) +1
-0+static struct of_device_id mpc85xx_ids[] = {
make this __initdata
arch/powerpc/platforms/85xx/mpc85xx_ads.c static int __init mpc85xx_ads_probe(void) · line 263
Quoted 4 lines
arch/powerpc/platforms/85xx/mpc85xx_ads.c +4
-0+static int __init mpc85xx_publish_devices (void ) +{ +if (!machine_is (mpc85xx_ads)) +return 0 ;
You don't need this if you make the change below.
arch/powerpc/platforms/85xx/mpc85xx_ads.c static int __init mpc85xx_ads_probe(void) · line 269
Quoted 5 lines
arch/powerpc/platforms/85xx/mpc85xx_ads.c +5
-0+of_platform_bus_probe (NULL , mpc85xx_ids,NULL ); + +return 0 ; +} +device_initcall (mpc85xx_publish_devices);
machine_devce_initcall(mpc85xx_ads, mpc85xx_publish_devices);
Quoted 3 lines
+++
b/arch/powerpc/platforms/85xx/mpc85xx_cds.c+static struct
of_device_idmpc85xx_ids[] = {
__initdata
arch/powerpc/platforms/85xx/mpc85xx_cds.c static int __init mpc85xx_cds_probe(void) · line 355
Quoted 10 lines
arch/powerpc/platforms/85xx/mpc85xx_cds.c +10
-0+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);
Same as above.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/2 powerpc: publish 85xx cds soc dts entries as of_device
In reply to Dave JiangPublish the devices listed in dts under SOC as of_device for mpc85xx_cds platforms.
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.
---
commit 4be72413410c560fe7ad5ef9156d43159003dad3
tree 8890093ee1cff0ec0cc9ce0b9367e134f528eed2
parent 19af35546de68c872dcb687613e0902a602cb20e
author Dave Jiang <[email protected]> Wed, 13 Feb 2008 14:03:33 -0700 committer Dave Jiang <djiang@blade.(none)> Wed, 13 Feb 2008 14:03:33 -0700
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
arch/powerpc/platforms/85xx/mpc85xx_cds.c +14 -0
@@ -26,6 +26,7 @@#include <linux/module.h> #include <linux/interrupt.h> #include <linux/fsl_devices.h> +#include <linux/of_platform.h> #include <asm/system.h> #include <asm/pgtable.h>
@@ -324,6 +325,19 @@ static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)seq_printf (m,"Memory\t\t: %d MB\n" , memsize / (1024 *1024 )); } +static struct of_device_id __initdata of_bus_ids[] = { + { .name ="soc" , }, + { .type ="soc" , }, + {}, +}; + +static int __init declare_of_platform_devices (void ) +{ +of_platform_bus_probe (NULL , of_bus_ids,NULL ); + +return 0 ; +} +machine_device_initcall (mpc85xx_cds, declare_of_platform_devices);/* * Called very early, device-tree isn't unflattened