From patchwork Sat Oct 23 01:05:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 278671 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 o9N1FMVk004909 for ; Sat, 23 Oct 2010 01:15:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752910Ab0JWBPP (ORCPT ); Fri, 22 Oct 2010 21:15:15 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:38166 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752618Ab0JWBPO (ORCPT ); Fri, 22 Oct 2010 21:15:14 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o9N1EwXU007073 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 22 Oct 2010 20:14:58 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o9N1EtLM017738; Fri, 22 Oct 2010 20:14:55 -0500 (CDT) Received: from localhost (bacab.am.dhcp.ti.com [128.247.77.143]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o9N1Etf25524; Fri, 22 Oct 2010 20:14:55 -0500 (CDT) From: Omar Ramirez Luna To: Tony Lindgren , Paul Walmsley Cc: Russell King , Kevin Hilman , Santosh Shilimkar , Kalle Jokiniemi , Rajendra Nayak , Felipe Contreras , Tero Kristo , Fernando Guzman Lugo , Rene Sapiens , Ernesto Ramos , linux-omap@vger.kernel.org, Paul Walmsley Subject: [PATCH 2/3] OMAP3: PM: update DSP reset code to use new SCM DSP boot control functions Date: Fri, 22 Oct 2010 20:05:00 -0500 Message-Id: <1287795901-28613-2-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1287795901-28613-1-git-send-email-omar.ramirez@ti.com> References: <1287795901-28613-1-git-send-email-omar.ramirez@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 (demeter1.kernel.org [140.211.167.41]); Sat, 23 Oct 2010 01:15:28 +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);