From patchwork Fri May 7 16:07:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 97767 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o47G7KDm026281 for ; Fri, 7 May 2010 16:07:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756917Ab0EGQHV (ORCPT ); Fri, 7 May 2010 12:07:21 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:37571 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756906Ab0EGQHT (ORCPT ); Fri, 7 May 2010 12:07:19 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o47G7ICj015405 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 May 2010 11:07:18 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o47G75sw009811; Fri, 7 May 2010 11:07:13 -0500 (CDT) From: Benoit Cousson To: linux-omap@vger.kernel.org Cc: Rajendra Nayak , Benoit Cousson , Paul Walmsley Subject: [PATCH 4/6] OMAP: hwmod: Temporary disable dependency Date: Fri, 7 May 2010 18:07:02 +0200 Message-Id: <1273248424-15943-5-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1273248424-15943-1-git-send-email-b-cousson@ti.com> References: <1273248424-15943-1-git-send-email-b-cousson@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 07 May 2010 16:07:24 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 2fff39f..302f2c8 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -908,7 +908,9 @@ static int _enable(struct omap_hwmod *oh) /* XXX mux balls */ +#if 0 _add_initiator_dep(oh, mpu_oh); +#endif _enable_clocks(oh); r = _wait_target_ready(oh); @@ -949,7 +951,9 @@ static int _idle(struct omap_hwmod *oh) if (oh->class->sysc) _sysc_idle(oh); +#if 0 _del_initiator_dep(oh, mpu_oh); +#endif _disable_clocks(oh); oh->_state = _HWMOD_STATE_IDLE; @@ -1544,7 +1548,10 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) int omap_hwmod_add_initiator_dep(struct omap_hwmod *oh, struct omap_hwmod *init_oh) { +#if 0 return _add_initiator_dep(oh, init_oh); +#endif + return 0; } /* @@ -1569,7 +1576,10 @@ int omap_hwmod_add_initiator_dep(struct omap_hwmod *oh, int omap_hwmod_del_initiator_dep(struct omap_hwmod *oh, struct omap_hwmod *init_oh) { +#if 0 return _del_initiator_dep(oh, init_oh); +#endif + return 0; } /**