summaryrefslogtreecommitdiffstats
path: root/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0047-clock34xx-only-try-to-idle-IVA-subsys-when-CONFIG_PM.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0047-clock34xx-only-try-to-idle-IVA-subsys-when-CONFIG_PM.patch')
-rw-r--r--extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0047-clock34xx-only-try-to-idle-IVA-subsys-when-CONFIG_PM.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0047-clock34xx-only-try-to-idle-IVA-subsys-when-CONFIG_PM.patch b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0047-clock34xx-only-try-to-idle-IVA-subsys-when-CONFIG_PM.patch
new file mode 100644
index 00000000..0db8bf7c
--- /dev/null
+++ b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0047-clock34xx-only-try-to-idle-IVA-subsys-when-CONFIG_PM.patch
@@ -0,0 +1,37 @@
1From 4d5f88fca430ca38a35e60683dc301e80046b05d Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 23 May 2010 14:47:32 +0200
4Subject: [PATCH 47/48] clock34xx: only try to idle IVA subsys when CONFIG_PM is set
5
6---
7 arch/arm/mach-omap2/clock34xx.c | 5 ++++-
8 1 files changed, 4 insertions(+), 1 deletions(-)
9
10diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
11index 2bb7182..a323f9f 100644
12--- a/arch/arm/mach-omap2/clock34xx.c
13+++ b/arch/arm/mach-omap2/clock34xx.c
14@@ -407,7 +407,9 @@ void omap3_clk_lock_dpll5(void)
15 return;
16 }
17
18+#ifdef CONFIG_PM
19 extern void __init omap3_iva_idle(void);
20+#endif
21
22 /*
23 * Initialize IVA to a idle state. This is typically done by the
24@@ -425,8 +427,9 @@ static void __init omap2_clk_iva_init_to_idle(void)
25 prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);
26 prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL);
27
28+#ifdef CONFIG_PM
29 omap3_iva_idle();
30-
31+#endif
32 }
33
34 /* REVISIT: Move this init stuff out into clock.c */
35--
361.6.6.1
37