Message ID | 1249477918-7200-1-git-send-email-ext-roger.quadros@nokia.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Kevin Hilman |
Headers | show |
Roger Quadros <ext-roger.quadros@nokia.com> writes: > 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 <ext-roger.quadros@nokia.com> Indeed, this was a merge goof on my part. Will fold into earlier patch to undo. Thanks, Kevin > --- > 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) > > -- > 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 5 Aug 2009, Roger Quadros wrote: > 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 <ext-roger.quadros@nokia.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> > --- > 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) > > -- > 1.6.0.4 > - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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 <ext-roger.quadros@nokia.com> --- arch/arm/mach-omap2/sleep34xx.S | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)