diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:13 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:13 +0800 |
| commit | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (patch) | |
| tree | f3715d78e72389582ce2ad5dc5c59051f1814b4b /include/linux/mfd/samsung/s2mps11.h | |
| parent | 03d8016839b087e141e26472fabcf860bc05cf7d (diff) | |
| parent | e429f243df2823451c92227317e5fce5f310b674 (diff) | |
Merge tag 'v4.1.25' into linux-linaro-lsk-v4.1lsk-v4.1-16.05
This is the 4.1.25 stable release
Diffstat (limited to 'include/linux/mfd/samsung/s2mps11.h')
| -rw-r--r-- | include/linux/mfd/samsung/s2mps11.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h index 7981a9d77d3f..ad81a1a7193f 100644 --- a/include/linux/mfd/samsung/s2mps11.h +++ b/include/linux/mfd/samsung/s2mps11.h @@ -173,10 +173,12 @@ enum s2mps11_regulators { #define S2MPS11_LDO_VSEL_MASK 0x3F #define S2MPS11_BUCK_VSEL_MASK 0xFF +#define S2MPS11_BUCK9_VSEL_MASK 0x1F #define S2MPS11_ENABLE_MASK (0x03 << S2MPS11_ENABLE_SHIFT) #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_BUCK9_N_VOLTAGES (S2MPS11_BUCK9_VSEL_MASK + 1) #define S2MPS11_RAMP_DELAY 25000 /* uV/us */ |