From patchwork Thu May 20 23:59:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 101273 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 o4KNxaGt008425 for ; Thu, 20 May 2010 23:59:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755261Ab0ETX7f (ORCPT ); Thu, 20 May 2010 19:59:35 -0400 Received: from mail-pz0-f185.google.com ([209.85.222.185]:58147 "EHLO mail-pz0-f185.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754516Ab0ETX7e (ORCPT ); Thu, 20 May 2010 19:59:34 -0400 Received: by mail-pz0-f185.google.com with SMTP id 15so206250pzk.15 for ; Thu, 20 May 2010 16:59:34 -0700 (PDT) Received: by 10.114.249.6 with SMTP id w6mr725432wah.0.1274399973988; Thu, 20 May 2010 16:59:33 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id f11sm3455050wai.11.2010.05.20.16.59.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 May 2010 16:59:33 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH] OMAP: hwmod: if IDLEST fields are not set, use module defaults Date: Thu, 20 May 2010 16:59:30 -0700 Message-Id: <1274399970-21732-2-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1274399970-21732-1-git-send-email-khilman@deeprootsystems.com> References: <1274399970-21732-1-git-send-email-khilman@deeprootsystems.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]); Thu, 20 May 2010 23:59:36 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index a127c9b..77fef90 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1036,6 +1036,12 @@ static int _setup(struct omap_hwmod *oh) oh->_state = _HWMOD_STATE_INITIALIZED; + /* if IDLEST values are not set, use module defaults */ + if (!oh->prcm.omap2.idlest_reg_id) + oh->prcm.omap2.idlest_reg_id = oh->prcm.omap2.prcm_reg_id; + if (!oh->prcm.omap2.idlest_idle_bit) + oh->prcm.omap2.idlest_idle_bit = oh->prcm.omap2.module_bit; + r = _enable(oh); if (r) { pr_warning("omap_hwmod: %s: cannot be enabled (%d)\n",