summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm.c
diff options
context:
space:
mode:
authorSanjeev Premi <premi@ti.com>2011-02-25 13:27:20 (GMT)
committerKevin Hilman <khilman@ti.com>2011-03-10 00:38:35 (GMT)
commit2de0baefaa7f2fad221bba6049e389e39990e2f0 (patch)
treeef90991985696c6cece302a4a2ff1487c1d5db70 /arch/arm/mach-omap2/pm.c
parent4071318983ff2dead7fd2caf85498bcd8956d93e (diff)
downloadlinux-fsl-qoriq-2de0baefaa7f2fad221bba6049e389e39990e2f0.tar.xz
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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index d5a102c..6e4eb7f 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)
static void omap2_init_processor_devices(void)
{
_init_omap_device("mpu", &mpu_dev);
- _init_omap_device("iva", &iva_dev);
+ if (omap3_has_iva())
+ _init_omap_device("iva", &iva_dev);
+
if (cpu_is_omap44xx()) {
_init_omap_device("l3_main_1", &l3_dev);
_init_omap_device("dsp", &dsp_dev);