Merge tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[sfrench/cifs-2.6.git] / arch / arm / mach-exynos / regs-pmu.h

diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index eb461e1c325ad96952495dad756af1d6b9c8a049..b7614333d2968befa767109f693bf7947528db4a 100644 (file)
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -43,12 +43,14 @@
 #define S5P_WAKEUP_STAT                                0x0600
 #define S5P_EINT_WAKEUP_MASK                   0x0604
 #define S5P_WAKEUP_MASK                                0x0608
+#define S5P_WAKEUP_MASK2                               0x0614
 
 #define S5P_INFORM0                            0x0800
 #define S5P_INFORM1                            0x0804
 #define S5P_INFORM5                            0x0814
 #define S5P_INFORM6                            0x0818
 #define S5P_INFORM7                            0x081C
+#define S5P_PMU_SPARE2                         0x0908
 #define S5P_PMU_SPARE3                         0x090C
 
 #define EXYNOS_IROM_DATA2                      0x0988
@@ -182,6 +184,7 @@
 
 #define S5P_CORE_LOCAL_PWR_EN                  0x3
 #define S5P_CORE_WAKEUP_FROM_LOCAL_CFG         (0x3 << 8)
+#define S5P_CORE_AUTOWAKEUP_EN                 (1 << 31)
 
 /* Only for EXYNOS4210 */
 #define S5P_CMU_CLKSTOP_LCD1_LOWPWR    0x1154