summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/omap4-sar-layout.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-03-28 14:45:31 -0700
committerTony Lindgren <tony@atomide.com>2013-03-28 14:45:31 -0700
commitc309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0 (patch)
tree130ae74f0178a73302ea47dfb29403c68875f403 /arch/arm/mach-omap2/omap4-sar-layout.h
parentcdcbdfb290b7b15315bf92fb5c339d0a8b32debf (diff)
parentfd1c07861491abf5e0e9ca06799bb5c48f99b64d (diff)
downloadolio-linux-3.10-c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0.tar.xz
olio-linux-3.10-c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0.zip
Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2
Diffstat (limited to 'arch/arm/mach-omap2/omap4-sar-layout.h')
-rw-r--r--arch/arm/mach-omap2/omap4-sar-layout.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap4-sar-layout.h b/arch/arm/mach-omap2/omap4-sar-layout.h
index e170fe803b0..6822d0a7324 100644
--- a/arch/arm/mach-omap2/omap4-sar-layout.h
+++ b/arch/arm/mach-omap2/omap4-sar-layout.h
@@ -20,13 +20,13 @@
#define SAR_BANK4_OFFSET 0x3000
/* Scratch pad memory offsets from SAR_BANK1 */
-#define SCU_OFFSET0 0xd00
-#define SCU_OFFSET1 0xd04
-#define OMAP_TYPE_OFFSET 0xd10
-#define L2X0_SAVE_OFFSET0 0xd14
-#define L2X0_SAVE_OFFSET1 0xd18
-#define L2X0_AUXCTRL_OFFSET 0xd1c
-#define L2X0_PREFETCH_CTRL_OFFSET 0xd20
+#define SCU_OFFSET0 0xfe4
+#define SCU_OFFSET1 0xfe8
+#define OMAP_TYPE_OFFSET 0xfec
+#define L2X0_SAVE_OFFSET0 0xff0
+#define L2X0_SAVE_OFFSET1 0xff4
+#define L2X0_AUXCTRL_OFFSET 0xff8
+#define L2X0_PREFETCH_CTRL_OFFSET 0xffc
/* CPUx Wakeup Non-Secure Physical Address offsets in SAR_BANK3 */
#define CPU0_WAKEUP_NS_PA_ADDR_OFFSET 0xa04