From patchwork Wed Aug 5 13:11:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 39364 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 n75DCiZG030953 for ; Wed, 5 Aug 2009 13:12:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933485AbZHENMl (ORCPT ); Wed, 5 Aug 2009 09:12:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934278AbZHENMl (ORCPT ); Wed, 5 Aug 2009 09:12:41 -0400 Received: from smtp.nokia.com ([192.100.122.233]:41080 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933485AbZHENMk (ORCPT ); Wed, 5 Aug 2009 09:12:40 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n75DCEqW017905; Wed, 5 Aug 2009 16:12:20 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 Aug 2009 16:12:21 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 Aug 2009 16:12:17 +0300 Received: from localhost.localdomain (esdhcp036246.research.nokia.com [172.21.36.246]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n75DCBH0002825; Wed, 5 Aug 2009 16:12:11 +0300 From: Roger Quadros To: khilman@deeprootsystems.com, paul@pwsan.com Cc: linux-omap@vger.kernel.org Subject: [PATCH] OMAP3: PM: Fix SDRC register addresses Date: Wed, 5 Aug 2009 16:11:58 +0300 Message-Id: <1249477918-7200-1-git-send-email-ext-roger.quadros@nokia.com> X-Mailer: git-send-email 1.6.0.4 X-OriginalArrivalTime: 05 Aug 2009 13:12:18.0146 (UTC) FILETIME=[5BD2AC20:01CA15CE] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org SDRC addresses are offset from OMAP3430_SDRC_RT_BASE and not OMAP3430_SMS_RT_BASE. This fixes OFF mode on EMU/HS devices. Signed-off-by: Roger Quadros Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/sleep34xx.S | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index 807b23e..53b6da9 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -49,13 +49,13 @@ #define SCRATCHPAD_BASE_P (OMAP343X_CTRL_BASE + OMAP343X_CONTROL_MEM_WKUP\ + SCRATCHPAD_MEM_OFFS) #define SDRC_POWER_V OMAP34XX_SDRC_REGADDR(SDRC_POWER) -#define SDRC_SYSCONFIG_P (OMAP3430_SMS_RT_BASE + SDRC_SYSCONFIG) -#define SDRC_MR_0_P (OMAP3430_SMS_RT_BASE + SDRC_MR_0) -#define SDRC_EMR2_0_P (OMAP3430_SMS_RT_BASE + SDRC_EMR2_0) -#define SDRC_MANUAL_0_P (OMAP3430_SMS_RT_BASE + SDRC_MANUAL_0) -#define SDRC_MR_1_P (OMAP3430_SMS_RT_BASE + SDRC_MR_1) -#define SDRC_EMR2_1_P (OMAP3430_SMS_RT_BASE + SDRC_EMR2_1) -#define SDRC_MANUAL_1_P (OMAP3430_SMS_RT_BASE + SDRC_MANUAL_1) +#define SDRC_SYSCONFIG_P (OMAP3430_SDRC_RT_BASE + SDRC_SYSCONFIG) +#define SDRC_MR_0_P (OMAP3430_SDRC_RT_BASE + SDRC_MR_0) +#define SDRC_EMR2_0_P (OMAP3430_SDRC_RT_BASE + SDRC_EMR2_0) +#define SDRC_MANUAL_0_P (OMAP3430_SDRC_RT_BASE + SDRC_MANUAL_0) +#define SDRC_MR_1_P (OMAP3430_SDRC_RT_BASE + SDRC_MR_1) +#define SDRC_EMR2_1_P (OMAP3430_SDRC_RT_BASE + SDRC_EMR2_1) +#define SDRC_MANUAL_1_P (OMAP3430_SDRC_RT_BASE + SDRC_MANUAL_1) #define SDRC_DLLA_STATUS_V OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS) #define SDRC_DLLA_CTRL_V OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL)