From patchwork Mon Oct 11 20:37:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 246401 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 o9BKdVvA023566 for ; Mon, 11 Oct 2010 20:39:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756134Ab0JKUjb (ORCPT ); Mon, 11 Oct 2010 16:39:31 -0400 Received: from utopia.booyaka.com ([72.9.107.138]:40280 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755739Ab0JKUj3 (ORCPT ); Mon, 11 Oct 2010 16:39:29 -0400 Received: (qmail 29529 invoked by uid 1019); 11 Oct 2010 20:39:28 -0000 MBOX-Line: From nobody Mon Oct 11 14:37:13 2010 Subject: [PATCH 2/3] OMAP3: PM: update DSP reset code to use new SCM DSP boot control functions To: fernando.lugo@ti.com From: Paul Walmsley Cc: Kevin Hilman , linux-omap@vger.kernel.org Date: Mon, 11 Oct 2010 14:37:13 -0600 Message-ID: <20101011203712.24425.1872.stgit@twilight.localdomain> In-Reply-To: <20101011203659.24425.2381.stgit@twilight.localdomain> References: <20101011203659.24425.2381.stgit@twilight.localdomain> User-Agent: StGit/0.15 MIME-Version: 1.0 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 (demeter1.kernel.org [140.211.167.41]); Mon, 11 Oct 2010 20:39:32 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 8c8f1ac..b90b1fb 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -614,6 +615,7 @@ static struct platform_suspend_ops omap_pm_ops = { * function forces the IVA2 into idle state so it can go * into retention/off and thus allow full-chip retention/off. * + * XXX This should be handled by the hwmod. **/ static void __init omap3_iva_idle(void) { @@ -635,9 +637,7 @@ static void __init omap3_iva_idle(void) cm_write_mod_reg(OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK, OMAP3430_IVA2_MOD, CM_FCLKEN); - /* Set IVA2 boot mode to 'idle' */ - omap_ctrl_writel(OMAP3_IVA2_BOOTMOD_IDLE, - OMAP343X_CONTROL_IVA2_BOOTMOD); + omap2430_ctrl_set_dsp_bootmode(OMAP_IVA2_DSP_BOOTMODE_IDLE); /* Un-reset IVA2 */ prm_write_mod_reg(0, OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);