From patchwork Thu Feb 5 11:34:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouni Hogander X-Patchwork-Id: 5636 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 n15BYkGg011943 for ; Thu, 5 Feb 2009 11:34:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752861AbZBELeU (ORCPT ); Thu, 5 Feb 2009 06:34:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752905AbZBELeU (ORCPT ); Thu, 5 Feb 2009 06:34:20 -0500 Received: from smtp.nokia.com ([192.100.105.134]:57391 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752861AbZBELeT (ORCPT ); Thu, 5 Feb 2009 06:34:19 -0500 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx09.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n15BXwBH015937 for ; Thu, 5 Feb 2009 05:34:16 -0600 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 5 Feb 2009 13:31:52 +0200 Received: from mgw-int01.ntc.nokia.com ([172.21.143.96]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 5 Feb 2009 13:31:52 +0200 Received: from localhost.localdomain (trdhcp147193.ntc.nokia.com [172.22.147.193]) by mgw-int01.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n15BVnvH013689 for ; Thu, 5 Feb 2009 13:31:51 +0200 From: Jouni Hogander To: linux-omap@vger.kernel.org Subject: [PATCH PM 1/1] OMAP3: PM: Save and restore also CM_CLKSEL1_PLL_IVA2 Date: Thu, 5 Feb 2009 13:34:01 +0200 Message-Id: <1233833641-5329-2-git-send-email-jouni.hogander@nokia.com> X-Mailer: git-send-email 1.6.0.1 In-Reply-To: <1233833641-5329-1-git-send-email-jouni.hogander@nokia.com> References: <1233833641-5329-1-git-send-email-jouni.hogander@nokia.com> X-OriginalArrivalTime: 05 Feb 2009 11:31:52.0097 (UTC) FILETIME=[573FD110:01C98785] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org CM_CLKSEL1_PLL_IVA2 is not saved/restored currently. This patch is adding save and restore for it. Signed-off-by: Jouni Hogander --- arch/arm/mach-omap2/prcm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index c64b668..7ccaf7f 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -36,6 +36,7 @@ static void __iomem *cm_base; struct omap3_prcm_regs { u32 control_padconf_sys_nirq; + u32 iva2_cm_clksel1; u32 iva2_cm_clksel2; u32 cm_sysconfig; u32 sgx_cm_clksel; @@ -218,6 +219,8 @@ void omap3_prcm_save_context(void) { prcm_context.control_padconf_sys_nirq = omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ); + prcm_context.iva2_cm_clksel1 = + cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL1); prcm_context.iva2_cm_clksel2 = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL2); prcm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG); @@ -371,6 +374,8 @@ void omap3_prcm_restore_context(void) { omap_ctrl_writel(prcm_context.control_padconf_sys_nirq, OMAP343X_CONTROL_PADCONF_SYSNIRQ); + cm_write_mod_reg(prcm_context.iva2_cm_clksel1, OMAP3430_IVA2_MOD, + CM_CLKSEL1); cm_write_mod_reg(prcm_context.iva2_cm_clksel2, OMAP3430_IVA2_MOD, CM_CLKSEL2); __raw_writel(prcm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG);