diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 10:14:13 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 10:14:13 (GMT) |
| commit | 37c3f0144c806e026b8d1ce0f41a5f57b25e44f5 (patch) | |
| tree | 8b6a01468627ad02def97829ab2f4298ee47431f /include/linux/mfd | |
| parent | abca37cd2e12a898289f2392c1658e711005535b (diff) | |
| parent | 90068348b7566c83efbf1985d7853a831aabfaf4 (diff) | |
| download | linux-fsl-qoriq-37c3f0144c806e026b8d1ce0f41a5f57b25e44f5.tar.xz | |
Merge remote-tracking branch 'regulator/fix/sec' into regulator-linus
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/samsung/s2mps11.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h index ad2252f..4e94dc6 100644 --- a/include/linux/mfd/samsung/s2mps11.h +++ b/include/linux/mfd/samsung/s2mps11.h @@ -189,6 +189,7 @@ enum s2mps11_regulators { #define S2MPS11_ENABLE_SHIFT 0x06 #define S2MPS11_LDO_N_VOLTAGES (S2MPS11_LDO_VSEL_MASK + 1) #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1) +#define S2MPS11_RAMP_DELAY 25000 /* uV/us */ #define S2MPS11_PMIC_EN_SHIFT 6 #define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3) |