diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-08-16 11:49:08 +0200 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2011-10-04 22:29:40 +0200 |
| commit | 476b679a5d785d1244f6b43ad26877acf278cd18 (patch) | |
| tree | c3f93d9742c4654c9d10af829db1122bac0b6f6f /arch/arm/mach-omap2/pm.c | |
| parent | arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver (diff) | |
| download | linux-476b679a5d785d1244f6b43ad26877acf278cd18.tar.xz linux-476b679a5d785d1244f6b43ad26877acf278cd18.zip | |
arm/dts: OMAP3+: Add mpu, dsp and iva nodes
Add nodes for devices used by PM code (mpu, dsp, iva).
Add a cpus node as well as recommended in the DT spec.
Remove mpu, dsp, iva devices init if is populated.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 9e78261fbfba..2ab7a9e17fe2 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -215,7 +215,8 @@ static void __init omap4_init_voltages(void) static int __init omap2_common_pm_init(void) { - omap2_init_processor_devices(); + if (!of_have_populated_dt()) + omap2_init_processor_devices(); omap_pm_if_init(); return 0; |