From 4d5f88fca430ca38a35e60683dc301e80046b05d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 23 May 2010 14:47:32 +0200 Subject: [PATCH 47/48] clock34xx: only try to idle IVA subsys when CONFIG_PM is set --- arch/arm/mach-omap2/clock34xx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 2bb7182..a323f9f 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -407,7 +407,9 @@ void omap3_clk_lock_dpll5(void) return; } +#ifdef CONFIG_PM extern void __init omap3_iva_idle(void); +#endif /* * Initialize IVA to a idle state. This is typically done by the @@ -425,8 +427,9 @@ static void __init omap2_clk_iva_init_to_idle(void) prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3); prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL); +#ifdef CONFIG_PM omap3_iva_idle(); - +#endif } /* REVISIT: Move this init stuff out into clock.c */ -- 1.6.6.1