From patchwork Tue Jul 21 15:28:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 36553 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 n6LFTC4D029931 for ; Tue, 21 Jul 2009 15:29:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751621AbZGUP3K (ORCPT ); Tue, 21 Jul 2009 11:29:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755405AbZGUP3K (ORCPT ); Tue, 21 Jul 2009 11:29:10 -0400 Received: from smtp.nokia.com ([192.100.105.134]:62876 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751621AbZGUP3K (ORCPT ); Tue, 21 Jul 2009 11:29:10 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n6LFS9p9008591; Tue, 21 Jul 2009 10:28:59 -0500 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 21 Jul 2009 18:28:53 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Tue, 21 Jul 2009 18:28:53 +0300 Received: from localhost.localdomain (esdhcp035150.research.nokia.com [172.21.35.150]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n6LFSohU014416; Tue, 21 Jul 2009 18:28:50 +0300 From: Roger Quadros To: khilman@deeprootsystems.com Cc: linux-omap@vger.kernel.org Subject: [PATCH] OMAP3: PM: Fix OFF mode on HS/EMU Devices Date: Tue, 21 Jul 2009 18:28:27 +0300 Message-Id: <1248190107-21703-1-git-send-email-ext-roger.quadros@nokia.com> X-Mailer: git-send-email 1.6.0.4 X-OriginalArrivalTime: 21 Jul 2009 15:28:53.0059 (UTC) FILETIME=[F42CE930:01CA0A17] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Defer calling omap3_save_scratchpad_contents() to after omap3_secure_ram_storage has been initialized. This fixes lockup & reboot while entering CORE OFF mode on HS/EMU devices. Signed-off-by: Roger Quadros --- arch/arm/mach-omap2/pm34xx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e80d59f..14f10bc 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -1101,7 +1101,6 @@ static int __init omap3_pm_init(void) pm_idle = omap3_pm_idle; - omap3_save_scratchpad_contents(); omap3_idle_init(); pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm); @@ -1131,6 +1130,7 @@ static int __init omap3_pm_init(void) local_fiq_enable(); } + omap3_save_scratchpad_contents(); err1: return ret; err2: