[PATCH] OMAP3: PM: fix scratchpad memory accesses for off-mode

[PATCH] OMAP3: PM: fix scratchpad memory accesses for off-mode

[Kevin Hilman]

Commit 914bab936fe0388a529079679e2f137aa4ff548d (OMAP: mach-omap2: Fix
incorrect assignment warnings) changed a pointer from 'u32 *' to
'void *' without also fixing up the pointer arithmetic.

Fix the scratchpad offsets so they are byte offsets instead of
word offsets and thus work correctly with a void pointer base.

Special thanks to Jean Pihet for taking the time track down this
problem and propose an initial solution.

Tested with off-idle and off-suspend on 36xx/Zoom3 and 34xx/omap3evm.

Cc: G, Manjunath Kondaiah <manjugk@ti.com>
Reported-by: Jean Pihet <jean.pihet@newoldbits.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
Tony, we need this queued for 2.6.37 as this is a regression fix.

 arch/arm/mach-omap2/pm34xx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 8c8f1ac..75c0cd1 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -50,9 +50,9 @@
 #include "control.h"
 
 /* Scratchpad offsets */
-#define OMAP343X_TABLE_ADDRESS_OFFSET	   0x31
-#define OMAP343X_TABLE_VALUE_OFFSET	   0x30
-#define OMAP343X_CONTROL_REG_VALUE_OFFSET  0x32
+#define OMAP343X_TABLE_ADDRESS_OFFSET	   0xc4
+#define OMAP343X_TABLE_VALUE_OFFSET	   0xc0
+#define OMAP343X_CONTROL_REG_VALUE_OFFSET  0xc8
 
 struct power_state {
 	struct powerdomain *pwrdm;
-- 
1.7.2.1

Re: [PATCH] OMAP3: PM: fix scratchpad memory accesses for off-mode

[Tony Lindgren]

* Kevin Hilman <khilman@deeprootsystems.com> [101008 15:35]:
> Commit 914bab936fe0388a529079679e2f137aa4ff548d (OMAP: mach-omap2: Fix
> incorrect assignment warnings) changed a pointer from 'u32 *' to
> 'void *' without also fixing up the pointer arithmetic.
> 
> Fix the scratchpad offsets so they are byte offsets instead of
> word offsets and thus work correctly with a void pointer base.
> 
> Special thanks to Jean Pihet for taking the time track down this
> problem and propose an initial solution.
> 
> Tested with off-idle and off-suspend on 36xx/Zoom3 and 34xx/omap3evm.
> 
> Cc: G, Manjunath Kondaiah <manjugk@ti.com>
> Reported-by: Jean Pihet <jean.pihet@newoldbits.com>
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> ---
> Tony, we need this queued for 2.6.37 as this is a regression fix.

Thanks, adding to omap-for-linus.

Tony