Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator updates from Mark Brown:
 "A respin of the merges in the previous pull request with one extra
  fix.

  A quiet release for the regulator API, quite a large number of small
  improvements all over but other than the addition of new drivers for
  the AS3722 and MAX14577 there is nothing of substantial non-local
  impact"

* tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (47 commits)
  regulator: pfuze100-regulator: Improve dev_info() message
  regulator: pfuze100-regulator: Fix some checkpatch complaints
  regulator: twl: Fix checkpatch issue
  regulator: core: Fix checkpatch issue
  regulator: anatop-regulator: Remove unneeded memset()
  regulator: s5m8767: Update LDO index in s5m8767-regulator.txt
  regulator: as3722: set enable time for SD0/1/6
  regulator: as3722: detect SD0 low-voltage mode
  regulator: tps62360: Fix up a pointer-integer size mismatch warning
  regulator: anatop-regulator: Remove unneeded kstrdup()
  regulator: act8865: Fix build error when !OF
  regulator: act8865: register all regulators regardless of how many are used
  regulator: wm831x-dcdc: Remove unneeded 'err' label
  regulator: anatop-regulator: Add MODULE_ALIAS()
  regulator: act8865: fix incorrect devm_kzalloc for act8865
  regulator: act8865: Remove set_suspend_[en|dis]able implementation
  regulator: act8865: Remove unneeded regulator_unregister() calls
  regulator: s2mps11: Clean up redundant code
  regulator: tps65910: Simplify setting enable_mask for regulators
  regulator: act8865: add device tree binding doc
  ...

4 files changed, 23 insertions, 10 deletions

diff --git a/include/linux/mfd/as3722.h b/include/linux/mfd/as3722.h
index f654a7a42260..8d43e9f2a842 100644
--- a/include/linux/mfd/as3722.h
+++ b/include/linux/mfd/as3722.h
@@ -151,6 +151,7 @@
 #define AS3722_ASIC_ID1_REG                             0x90
 #define AS3722_ASIC_ID2_REG                             0x91
 #define AS3722_LOCK_REG                                 0x9E
+#define AS3722_FUSE7_REG                                0xA7
 #define AS3722_MAX_REGISTER                             0xF4
 
 #define AS3722_SD0_EXT_ENABLE_MASK                      0x03
@@ -224,6 +225,7 @@
 #define AS3722_SD_VSEL_MASK                             0x7F
 #define AS3722_SD0_VSEL_MIN                             0x01
 #define AS3722_SD0_VSEL_MAX                             0x5A
+#define AS3722_SD0_VSEL_LOW_VOL_MAX                     0x6E
 #define AS3722_SD2_VSEL_MIN                             0x01
 #define AS3722_SD2_VSEL_MAX                             0x7F
 
@@ -342,6 +344,8 @@
 #define AS3722_EXT_CONTROL_ENABLE2                      0x2
 #define AS3722_EXT_CONTROL_ENABLE3                      0x3
 
+#define AS3722_FUSE7_SD0_LOW_VOLTAGE                    BIT(4)
+
 /* Interrupt IDs */
 enum as3722_irq {
         AS3722_IRQ_LID,
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index cab2dd279076..41c9bde410c5 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -59,12 +59,6 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic);
 void sec_irq_exit(struct sec_pmic_dev *sec_pmic);
 int sec_irq_resume(struct sec_pmic_dev *sec_pmic);
 
-extern int sec_reg_read(struct sec_pmic_dev *sec_pmic, u8 reg, void *dest);
-extern int sec_bulk_read(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf);
-extern int sec_reg_write(struct sec_pmic_dev *sec_pmic, u8 reg, u8 value);
-extern int sec_bulk_write(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf);
-extern int sec_reg_update(struct sec_pmic_dev *sec_pmic, u8 reg, u8 val, u8 mask);
-
 struct sec_platform_data {
         struct sec_regulator_data       *regulators;
         struct sec_opmode_data          *opmode;
diff --git a/include/linux/mfd/samsung/s5m8767.h b/include/linux/mfd/samsung/s5m8767.h
index 306a95fc558c..2ab0b0f03641 100644
--- a/include/linux/mfd/samsung/s5m8767.h
+++ b/include/linux/mfd/samsung/s5m8767.h
@@ -183,6 +183,22 @@ enum s5m8767_regulators {
         S5M8767_REG_MAX,
 };
 
-#define S5M8767_ENCTRL_SHIFT  6
+#define S5M8767_ENCTRL_SHIFT            6
+#define S5M8767_ENCTRL_MASK             (0x3 << S5M8767_ENCTRL_SHIFT)
+
+/*
+ * Values for BUCK_RAMP field in DVS_RAMP register, matching raw values
+ * in mV/us.
+ */
+enum s5m8767_dvs_buck_ramp_values {
+        S5M8767_DVS_BUCK_RAMP_5         = 0x4,
+        S5M8767_DVS_BUCK_RAMP_10        = 0x9,
+        S5M8767_DVS_BUCK_RAMP_12_5      = 0xb,
+        S5M8767_DVS_BUCK_RAMP_25        = 0xd,
+        S5M8767_DVS_BUCK_RAMP_50        = 0xe,
+        S5M8767_DVS_BUCK_RAMP_100       = 0xf,
+};
+#define S5M8767_DVS_BUCK_RAMP_SHIFT     4
+#define S5M8767_DVS_BUCK_RAMP_MASK      (0xf << S5M8767_DVS_BUCK_RAMP_SHIFT)
 
 #endif /* __LINUX_MFD_S5M8767_H */
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index 20e433e551e3..16c2335c2856 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -358,8 +358,6 @@
 /*Register BBCH  (0x80) register.RegisterDescription */
 #define BBCH_BBSEL_MASK                                 0x06
 #define BBCH_BBSEL_SHIFT                                1
-#define BBCH_BBCHEN_MASK                                0x01
-#define BBCH_BBCHEN_SHIFT                               0
 
 
 /*Register DCDCCTRL  (0x80) register.RegisterDescription */
@@ -833,6 +831,7 @@
 #define TPS65910_REG_VAUX2                              10
 #define TPS65910_REG_VAUX33                             11
 #define TPS65910_REG_VMMC                               12
+#define TPS65910_REG_VBB                                13
 
 #define TPS65911_REG_VDDCTRL                            4
 #define TPS65911_REG_LDO1                               5
@@ -845,7 +844,7 @@
 #define TPS65911_REG_LDO8                               12
 
 /* Max number of TPS65910/11 regulators */
-#define TPS65910_NUM_REGS                               13
+#define TPS65910_NUM_REGS                               14
 
 /* External sleep controls through EN1/EN2/EN3/SLEEP inputs */
 #define TPS65910_SLEEP_CONTROL_EXT_INPUT_EN1            0x1