← Back to branch summary

~beagleboard-kernel/+junk/2.6-stable

« back to all changes in this revision

Viewing changes to patches/for_next/0211-OMAP3-PM-Initialize-IVA-only-if-available.patch

  • Committer: Robert Nelson
  • Date: 2011-05-30 18:22:18 UTC
  • Revision ID: robertcnelson@gmail.com-20110530182218-kl9c2elev8wckknd
Tags: 2.6.39-x0
2.6.39-x0 release

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/for_next/0211-OMAP3-PM-Initialize-IVA-only-if-available.patch
1
 
From f47d42e125c0783a8870e2414d91409a0fcf6cf2 Mon Sep 17 00:00:00 2001
2
 
From: Sanjeev Premi <premi@ti.com>
3
 
Date: Fri, 25 Feb 2011 18:57:20 +0530
4
 
Subject: [PATCH 211/258] OMAP3: PM: Initialize IVA only if available
5
 
 
6
 
IVA device is not present in many OMAP3 variants.
7
 
 
8
 
This patch ensures that initialization is tied to
9
 
the presence of IVA on the device.
10
 
 
11
 
Signed-off-by: Sanjeev Premi <premi@ti.com>
12
 
Signed-off-by: Kevin Hilman <khilman@ti.com>
13
 
---
14
 
 arch/arm/mach-omap2/pm.c |    4 +++-
15
 
 1 files changed, 3 insertions(+), 1 deletions(-)
16
 
 
17
 
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
18
 
index 2c3a253..30af335 100644
19
 
--- a/arch/arm/mach-omap2/pm.c
20
 
+++ b/arch/arm/mach-omap2/pm.c
21
 
@@ -83,7 +83,9 @@ static int _init_omap_device(char *name, struct device **new_dev)
22
 
 static void omap2_init_processor_devices(void)
23
 
 {
24
 
        _init_omap_device("mpu", &mpu_dev);
25
 
-       _init_omap_device("iva", &iva_dev);
26
 
+       if (omap3_has_iva())
27
 
+               _init_omap_device("iva", &iva_dev);
28
 
+
29
 
        if (cpu_is_omap44xx()) {
30
 
                _init_omap_device("l3_main_1", &l3_dev);
31
 
                _init_omap_device("dsp", &dsp_dev);
32
 
1.7.1
33