From patchwork Sun Nov 7 21:43:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 307362 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 oA7LjJT0030051 for ; Sun, 7 Nov 2010 21:45:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753862Ab0KGVow (ORCPT ); Sun, 7 Nov 2010 16:44:52 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:44122 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753218Ab0KGVou (ORCPT ); Sun, 7 Nov 2010 16:44:50 -0500 Received: by mail-fx0-f46.google.com with SMTP id 16so3600214fxm.19 for ; Sun, 07 Nov 2010 13:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=+1741Uu5QaGjzPABQOq1hwC8XN+aTs6Zxb5HGch5U6E=; b=b4IUbOrYJcQtSlBSgUWqmlJE1OrYDKZOjnedoNbl6VZvc12TKZneLqjb3wg7/FVerF 2f6VxaTqQCxs6O2xyIfVscQOog9spu2jXjzgs1e423FMhpPz6qxDZfaCdQsBz3J2M68f nD++SwtLdF3p5Y7rOO1ZN4K9cRZEI5SyDiohQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=lr8fuZoJ/mxTW4/TJD+G9npxXmfL+6KH8r15OdxeutTTrJsNreXytEl1M2lyGIoxOS 77289CtqFfyHuLjar7RBoNCW5SKN4WnGeDBNHz8S1+g7jbpesesZRv684AxWaLTrsprH lMsMCHPPdmUY60fAMK4M9XM5WVTzPMKbjEHAo= Received: by 10.223.106.136 with SMTP id x8mr3074164fao.100.1289166289895; Sun, 07 Nov 2010 13:44:49 -0800 (PST) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d17sm1786027fav.5.2010.11.07.13.44.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 07 Nov 2010 13:44:49 -0800 (PST) From: Felipe Contreras To: linux-omap , Greg KH Cc: Omar Ramirez Luna , Tony Lindgren , Paul Walmsley , Fernando Guzman Lugo , Felipe Contreras Subject: [PATCH 3/5] omap: pm: use control functions in DSP reset code Date: Sun, 7 Nov 2010 23:43:27 +0200 Message-Id: <1289166209-32251-4-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.3.2.3.gf8529 In-Reply-To: References: 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]); Sun, 07 Nov 2010 21:45:20 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 75c0cd1..86e7e99 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); + omap_ctrl_set_dsp_bootmode(OMAP_DSP_BOOTMODE_IDLE); /* Un-reset IVA2 */ prm_write_mod_reg(0, OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);