git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'regmap-linus' and 'regmap-interface' into regmap-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
include
/
mach
/
regs-pmu.h
diff --git
a/arch/arm/mach-exynos4/include/mach/regs-pmu.h
b/arch/arm/mach-exynos4/include/mach/regs-pmu.h
index
a964337
..
fa49bbb
100644
(file)
--- a/
arch/arm/mach-exynos4/include/mach/regs-pmu.h
+++ b/
arch/arm/mach-exynos4/include/mach/regs-pmu.h
@@
-158,6
+158,7
@@
#define S5P_PMU_GPS_CONF S5P_PMUREG(0x3CE0)
#define S5P_PMU_SATA_PHY_CONTROL_EN 0x1
#define S5P_PMU_GPS_CONF S5P_PMUREG(0x3CE0)
#define S5P_PMU_SATA_PHY_CONTROL_EN 0x1
+#define S5P_CORE_LOCAL_PWR_EN 0x3
#define S5P_INT_LOCAL_PWR_EN 0x7
#define S5P_CHECK_SLEEP 0x00000BAD
#define S5P_INT_LOCAL_PWR_EN 0x7
#define S5P_CHECK_SLEEP 0x00000BAD