From aa5487b74fd30dde58401a11cee137f67ce2f42d Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Tue, 21 Sep 2010 10:34:08 -0600 Subject: [PATCH] --- yaml --- r: 216847 b: refs/heads/master c: 3827f9492bdff045ae57fe67e65ce7e259ed4219 h: refs/heads/master i: 216845: e5b0dff51ee0b75bfc18a6e0aeab98404e6ae2ec 216843: 1fe8838a891afc353e510aaa0d25a7ceb36ec210 216839: 1a4c998f064c7ec8344968a023db9ea89145308c 216831: 751691344ce8d89d930910a5720d09df3f3fa67b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c57d8dae372e..f18fc4a90421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee9fff92e02e8c5f84794b3a5ce47646c2dfc39 +refs/heads/master: 3827f9492bdff045ae57fe67e65ce7e259ed4219 diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c index 8bf19a7efb5c..5bb25e319b76 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c @@ -982,9 +982,13 @@ static int _shutdown(struct omap_hwmod *oh) if (oh->class->sysc) _sysc_shutdown(oh); - _del_initiator_dep(oh, mpu_oh); - /* XXX what about the other system initiators here? DMA, tesla, d2d */ - _disable_clocks(oh); + + /* clocks and deps are already disabled in idle */ + if (oh->_state == _HWMOD_STATE_ENABLED) { + _del_initiator_dep(oh, mpu_oh); + /* XXX what about the other system initiators here? dma, dsp */ + _disable_clocks(oh); + } /* XXX Should this code also force-disable the optional clocks? */ /* XXX mux any associated balls to safe mode */