From patchwork Thu Oct 14 18:52:20 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paul Walmsley <paul@pwsan.com>
X-Patchwork-Id: 254191
X-Patchwork-Delegate: paul@pwsan.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9EIpbf4015932
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 14 Oct 2010 18:52:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753300Ab0JNSwW (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 14 Oct 2010 14:52:22 -0400
Received: from utopia.booyaka.com ([72.9.107.138]:35508 "EHLO
	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753146Ab0JNSwV (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Thu, 14 Oct 2010 14:52:21 -0400
Received: (qmail 22980 invoked by uid 1019); 14 Oct 2010 18:52:21 -0000
Date: Thu, 14 Oct 2010 12:52:20 -0600 (MDT)
From: Paul Walmsley <paul@pwsan.com>
To: "Varadarajan, Charulatha" <charu@ti.com>
cc: Kevin Hilman <khilman@deeprootsystems.com>,
	"Cousson, Benoit" <b-cousson@ti.com>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: RE: [PATCH] omap2plus: wdt: Fix boot warn when CONFIG_PM_RUNTIME=n
In-Reply-To: <alpine.DEB.2.00.1010141234190.21196@utopia.booyaka.com>
Message-ID: <alpine.DEB.2.00.1010141250490.21196@utopia.booyaka.com>
References: <1286798556-22749-1-git-send-email-charu@ti.com>
	<4CB40B07.8080301@ti.com>
	<EAF47CD23C76F840A9E7FCE10091EFAB030CFC553C@dbde02.ent.ti.com>
	<4CB45E0E.6080104@ti.com> <87mxqj1d2v.fsf@deeprootsystems.com>
	<EAF47CD23C76F840A9E7FCE10091EFAB030D09A22D@dbde02.ent.ti.com>
	<alpine.DEB.2.00.1010141234190.21196@utopia.booyaka.com>
User-Agent: Alpine 2.00 (DEB 1167 2008-08-23)
MIME-Version: 1.0
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 14 Oct 2010 18:52:53 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 618e135..92dd369 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1261,6 +1261,9 @@ int _omap_hwmod_idle(struct omap_hwmod *oh)
  */
 static int _shutdown(struct omap_hwmod *oh)
 {
+	int ret;
+	u8 prev_state;
+
 	if (oh->_state != _HWMOD_STATE_IDLE &&
 	    oh->_state != _HWMOD_STATE_ENABLED) {
 		WARN(1, "omap_hwmod: %s: disabled state can only be entered "
@@ -1270,6 +1273,18 @@ static int _shutdown(struct omap_hwmod *oh)
 
 	pr_debug("omap_hwmod: %s: disabling\n", oh->name);
 
+	if (oh->class->pre_shutdown) {
+		prev_state = oh->_state;
+		if (oh->_state == _HWMOD_STATE_IDLE)
+			_omap_hwmod_enable(oh);
+		ret = oh->class->pre_shutdown(oh);
+		if (ret) {
+			if (prev_state == _HWMOD_STATE_IDLE)
+				_omap_hwmod_idle(oh);
+			return ret;
+		}
+	}
+
 	if (oh->class->sysc)
 		_shutdown_sysc(oh);