summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown2013-09-01 14:50:21 +0200
committerMark Brown2013-09-01 14:50:21 +0200
commit04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba (patch)
tree1ac7ccb8e6f1da49cfa998ee44f2a44def9fc5d1 /include/linux/mfd
parentMerge remote-tracking branch 'regulator/topic/ramp' into regulator-next (diff)
parentregulator: s2mps11: Fix setting ramp_delay (diff)
downloadkernel-qcow2-linux-04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba.tar.gz
kernel-qcow2-linux-04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba.tar.xz
kernel-qcow2-linux-04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba.zip
Merge remote-tracking branch 'regulator/topic/sec' into regulator-next
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/samsung/s2mps11.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index 4e94dc65f987..d0d52ea60074 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -191,6 +191,17 @@ enum s2mps11_regulators {
#define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
#define S2MPS11_RAMP_DELAY 25000 /* uV/us */
+
+#define S2MPS11_BUCK2_RAMP_SHIFT 6
+#define S2MPS11_BUCK34_RAMP_SHIFT 4
+#define S2MPS11_BUCK5_RAMP_SHIFT 6
+#define S2MPS11_BUCK16_RAMP_SHIFT 4
+#define S2MPS11_BUCK7810_RAMP_SHIFT 2
+#define S2MPS11_BUCK9_RAMP_SHIFT 0
+#define S2MPS11_BUCK2_RAMP_EN_SHIFT 3
+#define S2MPS11_BUCK3_RAMP_EN_SHIFT 2
+#define S2MPS11_BUCK4_RAMP_EN_SHIFT 1
+#define S2MPS11_BUCK6_RAMP_EN_SHIFT 0
#define S2MPS11_PMIC_EN_SHIFT 6
#define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)