From: Djamil Elaidi Date: Sun, 17 Jun 2012 17:57:51 +0000 (-0600) Subject: ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby X-Git-Tag: upstream/snapshot3+hdmi~7182^2~3^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=561038f0a8aa1de272a2ac5dad24cc8246d9f496;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby If an IP is configured in Smart-Standby-Wakeup, when disabling wakeup feature the IP will not go back to Smart-Standby, but will remain in Smart-Standby-Wakeup. Signed-off-by: Djamil Elaidi Signed-off-by: Paul Walmsley --- diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index bf86f7e..7731936 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -530,7 +530,7 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v) if (oh->class->sysc->idlemodes & SIDLE_SMART_WKUP) _set_slave_idlemode(oh, HWMOD_IDLEMODE_SMART, v); if (oh->class->sysc->idlemodes & MSTANDBY_SMART_WKUP) - _set_master_standbymode(oh, HWMOD_IDLEMODE_SMART_WKUP, v); + _set_master_standbymode(oh, HWMOD_IDLEMODE_SMART, v); /* XXX test pwrdm_get_wken for this hwmod's subsystem */