Merge remote-tracking branch 'regulator/for-next'

diff --cc include/linux/mfd/samsung/s2mps11.h
index 179e10ca095b3f85a6ad60402e948807095537a2,d0d52ea6007439c18c3cf17bb71961187da72026..b3ddf98dec3734ea7c4fc483a2efacc8cd7dfcad
--- 1/include/linux/mfd/samsung/s2mps11.h
--- 2/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@@ -188,6 -191,18 +188,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)
  
  #endif /*  __LINUX_MFD_S2MPS11_H */