diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:21 -0400 |
| commit | 04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba (patch) | |
| tree | 1ac7ccb8e6f1da49cfa998ee44f2a44def9fc5d1 /include/linux | |
| parent | a89f5c759857b1d1a56a4d530ad30bc1cacc58c9 (diff) | |
| parent | f8f1d48be393f517a16de4271cc8b7854efd693a (diff) | |
Merge remote-tracking branch 'regulator/topic/sec' into regulator-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/samsung/s2mps11.h | 11 |
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 { | |||
| 191 | #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1) | 191 | #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1) |
| 192 | #define S2MPS11_RAMP_DELAY 25000 /* uV/us */ | 192 | #define S2MPS11_RAMP_DELAY 25000 /* uV/us */ |
| 193 | 193 | ||
| 194 | |||
| 195 | #define S2MPS11_BUCK2_RAMP_SHIFT 6 | ||
| 196 | #define S2MPS11_BUCK34_RAMP_SHIFT 4 | ||
| 197 | #define S2MPS11_BUCK5_RAMP_SHIFT 6 | ||
| 198 | #define S2MPS11_BUCK16_RAMP_SHIFT 4 | ||
| 199 | #define S2MPS11_BUCK7810_RAMP_SHIFT 2 | ||
| 200 | #define S2MPS11_BUCK9_RAMP_SHIFT 0 | ||
| 201 | #define S2MPS11_BUCK2_RAMP_EN_SHIFT 3 | ||
| 202 | #define S2MPS11_BUCK3_RAMP_EN_SHIFT 2 | ||
| 203 | #define S2MPS11_BUCK4_RAMP_EN_SHIFT 1 | ||
| 204 | #define S2MPS11_BUCK6_RAMP_EN_SHIFT 0 | ||
| 194 | #define S2MPS11_PMIC_EN_SHIFT 6 | 205 | #define S2MPS11_PMIC_EN_SHIFT 6 |
| 195 | #define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3) | 206 | #define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3) |
| 196 | 207 | ||