diff options
| author | Kukjin Kim | 2014-07-23 08:18:08 +0900 |
|---|---|---|
| committer | Kukjin Kim | 2014-07-23 08:18:08 +0900 |
| commit | 036c37c5809585495661d0eb6e78e0a3612ccde3 (patch) | |
| tree | fd57213411c54bc09844e91d49a1eb86214ca8ed /arch/arm/mach-exynos/regs-pmu.h | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| parent | fce9e5bb25264153f9f002eada41757118d25ba9 (diff) | |
Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/power-exynos
Diffstat (limited to 'arch/arm/mach-exynos/regs-pmu.h')
| -rw-r--r-- | arch/arm/mach-exynos/regs-pmu.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index 1d13b08708f0..1993e6bd5388 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -15,7 +15,6 @@ #include <mach/map.h> #define S5P_PMUREG(x) (S5P_VA_PMU + (x)) -#define S5P_SYSREG(x) (S3C_VA_SYS + (x)) #define S5P_CENTRAL_SEQ_CONFIGURATION S5P_PMUREG(0x0200) @@ -127,7 +126,6 @@ #define S5P_PAD_RET_EBIB_OPTION S5P_PMUREG(0x31A8) #define S5P_CORE_LOCAL_PWR_EN 0x3 -#define S5P_INT_LOCAL_PWR_EN 0x7 /* Only for EXYNOS4210 */ #define S5P_CMU_CLKSTOP_LCD1_LOWPWR S5P_PMUREG(0x1154) @@ -188,8 +186,6 @@ /* For EXYNOS5 */ -#define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234) - #define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408) #define EXYNOS5_MASK_WDTRESET_REQUEST S5P_PMUREG(0x040C) |