diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-11-21 21:40:23 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-11-21 21:40:23 +0900 |
| commit | 68847edc835e582dacbc90ded0c51d27b2ee2bf7 (patch) | |
| tree | 82cc53aca70ce426098564b463f9644f152876b7 /arch/arm/mach-exynos/regs-pmu.h | |
| parent | 03c1b7609fbb367c7a9ae49bd41e72cad38fe305 (diff) | |
| parent | 13cfa6c4f7facfc690ba9e99ec382c151fddaced (diff) | |
Merge branch 'v3.19-next/cleanup-samsung' into v3.19-next/mach-exynos
Diffstat (limited to 'arch/arm/mach-exynos/regs-pmu.h')
| -rw-r--r-- | arch/arm/mach-exynos/regs-pmu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index 4ea5e320c6d1..322f13277c3b 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -20,6 +20,7 @@ #define S5P_USE_STANDBY_WFI0 (1 << 16) #define S5P_USE_STANDBY_WFE0 (1 << 24) +#define S5P_USE_DELAYED_RESET_ASSERTION BIT(12) #define EXYNOS_CORE_PO_RESET(n) ((1 << 4) << n) #define EXYNOS_WAKEUP_FROM_LOWPWR (1 << 28) @@ -108,6 +109,8 @@ (EXYNOS_ARM_CORE0_CONFIGURATION + (0x80 * (_nr))) #define EXYNOS_ARM_CORE_STATUS(_nr) \ (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x4) +#define EXYNOS_ARM_CORE_OPTION(_nr) \ + (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x8) #define EXYNOS_ARM_COMMON_CONFIGURATION 0x2500 #define EXYNOS_COMMON_CONFIGURATION(_nr) \ |