From patchwork Thu Oct 22 23:09:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 55502 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9MNBnWK019716 for ; Thu, 22 Oct 2009 23:11:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755658AbZJVXLn (ORCPT ); Thu, 22 Oct 2009 19:11:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755635AbZJVXLn (ORCPT ); Thu, 22 Oct 2009 19:11:43 -0400 Received: from mail-qy0-f194.google.com ([209.85.221.194]:37878 "EHLO mail-qy0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755215AbZJVXLm (ORCPT ); Thu, 22 Oct 2009 19:11:42 -0400 Received: by mail-qy0-f194.google.com with SMTP id 32so5544712qyk.4 for ; Thu, 22 Oct 2009 16:11:47 -0700 (PDT) Received: by 10.224.71.233 with SMTP id i41mr5008287qaj.89.1256253107134; Thu, 22 Oct 2009 16:11:47 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 6sm6561628qwd.38.2009.10.22.16.11.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 22 Oct 2009 16:11:46 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Tero Kristo , Jouni Hogander Subject: [PATCH v2 30/32] OMAP3: PM: MPU and CORE should stay awake if there is CAM domain ACTIVE Date: Thu, 22 Oct 2009 16:09:51 -0700 Message-Id: <1256252993-24328-31-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.4.3 In-Reply-To: <1256252993-24328-30-git-send-email-khilman@deeprootsystems.com> References: <1256252993-24328-1-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-2-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-3-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-4-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-5-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-6-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-7-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-8-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-9-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-10-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-11-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-12-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-13-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-14-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-15-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-16-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-17-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-18-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-19-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-20-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-21-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-22-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-23-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-24-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-25-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-26-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-27-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-28-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-29-git-send-email-khilman@deeprootsystems.com> <1256252993-24328-30-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 diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 55567bf..7623eda 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -80,6 +80,7 @@ static int (*_omap_save_secure_sram)(u32 *addr); static struct powerdomain *mpu_pwrdm, *neon_pwrdm; static struct powerdomain *core_pwrdm, *per_pwrdm; +static struct powerdomain *cam_pwrdm; static int set_pwrdm_state(struct powerdomain *pwrdm, u32 state); @@ -355,6 +356,9 @@ static void omap_sram_idle(void) } } + if (pwrdm_read_pwrst(cam_pwrdm) == PWRDM_POWER_ON) + omap2_clkdm_deny_idle(mpu_pwrdm->pwrdm_clkdms[0]); + /* CORE */ if (core_next_state < PWRDM_POWER_ON) { omap_uart_prepare_idle(0); @@ -434,6 +438,7 @@ static void omap_sram_idle(void) pwrdm_post_transition(); + omap2_clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]); } /* @@ -1067,6 +1072,7 @@ static int __init omap3_pm_init(void) neon_pwrdm = pwrdm_lookup("neon_pwrdm"); per_pwrdm = pwrdm_lookup("per_pwrdm"); core_pwrdm = pwrdm_lookup("core_pwrdm"); + cam_pwrdm = pwrdm_lookup("cam_pwrdm"); omap_push_sram_idle(); #ifdef CONFIG_SUSPEND