Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de658158 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

OMAP3: PM: fix scratchpad memory accesses for off-mode 



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: Manjunath Kondaiah G <manjugk@ti.com>
Reported-by: default avatarJean Pihet <jean.pihet@newoldbits.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Tested-by: default avatarJean Pihet <jean.pihet@newoldbits.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a7c88751

arch/arm/mach-omap2/pm34xx.c

+3 −3
Original line number Diff line number Diff line
@@ -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;