Add nodes for devices used by PM code (mpu, dsp, iva). Add an empty cpus node as well as recommended in the DT spec.
Remove mpu, dsp, iva devices init if CONFIG_OF is defined. Ideally the whole function should be removed. It will be doable as soon as the OMAP3 DT support will be added. Signed-off-by: Benoit Cousson <[email protected]> Cc: Grant Likely <[email protected]> Cc: Kevin Hilman <[email protected]> --- arch/arm/boot/dts/omap4.dtsi | 28 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/pm.c | 5 ++++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 928a74c..a3efe76 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -25,11 +25,39 @@ }; /* + * XXX: The cpus node is mandatory, but since the CPUs are as well part + * of the mpu subsystem below, it is not clear where the information + * should be. Maybe here with a phandle inside the mpu? + */ + cpus { + }; + + /* * The soc node represents the soc top level view. It is uses for IPs * that are not memory mapped in the MPU view or for the MPU itself. */ soc { compatible = "ti,omap-infra"; + mpu { + compatible = "ti,omap4-mpu"; + hwmods = "mpu"; + cpu@0 { + compatible = "arm,cortex-a9"; + }; + cpu@1 { + compatible = "arm,cortex-a9"; + }; + }; + + dsp { + compatible = "ti,omap4-c64", "ti,c64"; + hwmods = "dsp"; + }; + + iva { + compatible = "ti,ivahd", "ti,iva"; + hwmods = "iva"; + }; }; /* diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 832577a..ba4d187 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -49,15 +49,18 @@ static int _init_omap_device(char *name) */ static void omap2_init_processor_devices(void) { - _init_omap_device("mpu"); if (omap3_has_iva()) _init_omap_device("iva"); if (cpu_is_omap44xx()) { +#ifndef CONFIG_OF + _init_omap_device("mpu"); _init_omap_device("l3_main_1"); _init_omap_device("dsp"); _init_omap_device("iva"); +#endif } else { + _init_omap_device("mpu"); _init_omap_device("l3_main"); } } -- 1.7.0.4 _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
