diff options
author | Sanjeev Premi <premi@ti.com> | 2011-02-25 08:27:20 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-03-09 19:38:35 -0500 |
commit | 2de0baefaa7f2fad221bba6049e389e39990e2f0 (patch) | |
tree | ef90991985696c6cece302a4a2ff1487c1d5db70 /arch/arm/mach-omap2/pm.c | |
parent | 4071318983ff2dead7fd2caf85498bcd8956d93e (diff) |
OMAP3: PM: Initialize IVA only if available
IVA device is not present in many OMAP3 variants.
This patch ensures that initialization is tied to
the presence of IVA on the device.
Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index d5a102c71989..6e4eb7ff95a8 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -83,7 +83,9 @@ static int _init_omap_device(char *name, struct device **new_dev) | |||
83 | static void omap2_init_processor_devices(void) | 83 | static void omap2_init_processor_devices(void) |
84 | { | 84 | { |
85 | _init_omap_device("mpu", &mpu_dev); | 85 | _init_omap_device("mpu", &mpu_dev); |
86 | _init_omap_device("iva", &iva_dev); | 86 | if (omap3_has_iva()) |
87 | _init_omap_device("iva", &iva_dev); | ||
88 | |||
87 | if (cpu_is_omap44xx()) { | 89 | if (cpu_is_omap44xx()) { |
88 | _init_omap_device("l3_main_1", &l3_dev); | 90 | _init_omap_device("l3_main_1", &l3_dev); |
89 | _init_omap_device("dsp", &dsp_dev); | 91 | _init_omap_device("dsp", &dsp_dev); |