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

Pull regulator updates from Mark Brown:
 "Not much exciting going on with the regulator API this time around,
  lots of driver fixes and enhancements - the main thing is the addition
  of a new API to help make the stubbing code do the right thing for
  missing regulator mappings.

  Highlights:

   - A new regulator_get_optional() API call for regulators that can be
     absent in normal operation.  This currently does nothing but will
     be used to improve the stubbing code for unspecified regulators,
     helping avoid some of the issues we've seen with adding new
     regulator support.
   - Helpers for devices with multiple linear ranges of voltages in the
     same regulator.
   - Moved the helpers into a separate file since core.c is getting
     rather large.
   - New drivers for Dialog DA9210 and DA9063, Freescale pfuze100 and
     Marvell 88pm800"

* tag 'regulator-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (70 commits)
  regulator: da9063: Statize da9063_ldo_lim_event
  regulator: lp872x: Make REGULATOR_LP872X depend on I2C rather than I2C=y
  regulator: tps65217: Convert to use linear ranges
  regulator: da9063: Use IS_ERR to check return value of regulator_register()
  regulator: da9063: Optimize da9063_set_current_limit implementation
  regulator: build: Allow most regulators to be built as modules
  regulator: Add devm_regulator_get_exclusive()
  regulator: da9063: Add Dialog DA9063 voltage regulators support.
  regulator: ti-abb: simplify platform_get_resource_byname/devm_ioremap_resource
  hwmon: (sht15) Use devm_regulator_get_optional()
  regulator: core: Use bool for exclusivitity flag
  regulator: 88pm800: forever loop in pm800_regulator_probe()
  cpufreq: cpufreq-cpu0: Use devm_regulator_get_optional()
  regulator: da9210: Remove redundant MODULE_ALIAS
  regulator: 88pm800: Fix checking whether num_regulator is valid
  regulator: s2mps11: Fix setting ramp_delay
  regulator: s2mps11: Fix wrong arguments for regmap_update_bits() call
  regulator: palmas: Update the DT binding doc for smps10 out1 and out2
  regulator: palmas: model SMPS10 as two regulators
  regulator: core: Move list_voltage_{linear,linear_range,table} to helpers.c
  ...

9 files changed, 118 insertions, 26 deletions

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 1a8dd7afe084..c06d78af3342 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -160,7 +160,8 @@ enum palmas_regulators {
         PALMAS_REG_SMPS7,
         PALMAS_REG_SMPS8,
         PALMAS_REG_SMPS9,
-        PALMAS_REG_SMPS10,
+        PALMAS_REG_SMPS10_OUT2,
+        PALMAS_REG_SMPS10_OUT1,
         /* LDO regulators */
         PALMAS_REG_LDO1,
         PALMAS_REG_LDO2,
@@ -355,9 +356,9 @@ struct palmas_pmic {
         int smps123;
         int smps457;
 
-        int range[PALMAS_REG_SMPS10];
-        unsigned int ramp_delay[PALMAS_REG_SMPS10];
-        unsigned int current_reg_mode[PALMAS_REG_SMPS10];
+        int range[PALMAS_REG_SMPS10_OUT1];
+        unsigned int ramp_delay[PALMAS_REG_SMPS10_OUT1];
+        unsigned int current_reg_mode[PALMAS_REG_SMPS10_OUT1];
 };
 
 struct palmas_resource {
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 {
 #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)
 
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
index 29eab2bd3dfa..a5a7f0130e96 100644
--- a/include/linux/mfd/tps65217.h
+++ b/include/linux/mfd/tps65217.h
@@ -244,24 +244,6 @@ struct tps65217_board {
 };
 
 /**
- * struct tps_info - packages regulator constraints
- * @name:               Voltage regulator name
- * @min_uV:             minimum micro volts
- * @max_uV:             minimum micro volts
- * @vsel_to_uv:         Function pointer to get voltage from selector
- * @uv_to_vsel:         Function pointer to get selector from voltage
- *
- * This data is used to check the regualtor voltage limits while setting.
- */
-struct tps_info {
-        const char *name;
-        int min_uV;
-        int max_uV;
-        int (*vsel_to_uv)(unsigned int vsel);
-        int (*uv_to_vsel)(int uV, unsigned int *vsel);
-};
-
-/**
  * struct tps65217 - tps65217 sub-driver chip access routines
  *
  * Device data may be used to access the TPS65217 chip
@@ -273,7 +255,6 @@ struct tps65217 {
         unsigned int id;
         struct regulator_desc desc[TPS65217_NUM_REGULATOR];
         struct regulator_dev *rdev[TPS65217_NUM_REGULATOR];
-        struct tps_info *info[TPS65217_NUM_REGULATOR];
         struct regmap *regmap;
 };
 
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 3a76389c6aaa..27be915caa96 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -137,6 +137,12 @@ struct regulator *__must_check devm_regulator_get(struct device *dev,
                                              const char *id);
 struct regulator *__must_check regulator_get_exclusive(struct device *dev,
                                                        const char *id);
+struct regulator *__must_check devm_regulator_get_exclusive(struct device *dev,
+                                                        const char *id);
+struct regulator *__must_check regulator_get_optional(struct device *dev,
+                                                      const char *id);
+struct regulator *__must_check devm_regulator_get_optional(struct device *dev,
+                                                           const char *id);
 void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 
@@ -217,6 +223,25 @@ devm_regulator_get(struct device *dev, const char *id)
         return NULL;
 }
 
+static inline struct regulator *__must_check
+regulator_get_exclusive(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+static inline struct regulator *__must_check
+regulator_get_optional(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+
+static inline struct regulator *__must_check
+devm_regulator_get_optional(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
 static inline void regulator_put(struct regulator *regulator)
 {
 }
@@ -369,8 +394,11 @@ static inline int regulator_count_voltages(struct regulator *regulator)
 static inline int regulator_set_voltage_tol(struct regulator *regulator,
                                             int new_uV, int tol_uV)
 {
-        return regulator_set_voltage(regulator,
-                                     new_uV - tol_uV, new_uV + tol_uV);
+        if (regulator_set_voltage(regulator, new_uV, new_uV + tol_uV) == 0)
+                return 0;
+        else
+                return regulator_set_voltage(regulator,
+                                             new_uV - tol_uV, new_uV + tol_uV);
 }
 
 static inline int regulator_is_supported_voltage_tol(struct regulator *regulator,
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 6700cc94bdd1..67e13aa5a478 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -40,6 +40,24 @@ enum regulator_status {
 };
 
 /**
+ * Specify a range of voltages for regulator_map_linar_range() and
+ * regulator_list_linear_range().
+ *
+ * @min_uV:  Lowest voltage in range
+ * @max_uV:  Highest voltage in range
+ * @min_sel: Lowest selector for range
+ * @max_sel: Highest selector for range
+ * @uV_step: Step size
+ */
+struct regulator_linear_range {
+        unsigned int min_uV;
+        unsigned int max_uV;
+        unsigned int min_sel;
+        unsigned int max_sel;
+        unsigned int uV_step;
+};
+
+/**
  * struct regulator_ops - regulator operations.
  *
  * @enable: Configure the regulator as enabled.
@@ -223,6 +241,9 @@ struct regulator_desc {
         unsigned int linear_min_sel;
         unsigned int ramp_delay;
 
+        const struct regulator_linear_range *linear_ranges;
+        int n_linear_ranges;
+
         const unsigned int *volt_table;
 
         unsigned int vsel_reg;
@@ -326,10 +347,14 @@ int regulator_mode_to_status(unsigned int);
 
 int regulator_list_voltage_linear(struct regulator_dev *rdev,
                                   unsigned int selector);
+int regulator_list_voltage_linear_range(struct regulator_dev *rdev,
+                                        unsigned int selector);
 int regulator_list_voltage_table(struct regulator_dev *rdev,
                                   unsigned int selector);
 int regulator_map_voltage_linear(struct regulator_dev *rdev,
                                   int min_uV, int max_uV);
+int regulator_map_voltage_linear_range(struct regulator_dev *rdev,
+                                       int min_uV, int max_uV);
 int regulator_map_voltage_iterate(struct regulator_dev *rdev,
                                   int min_uV, int max_uV);
 int regulator_map_voltage_ascend(struct regulator_dev *rdev,
diff --git a/include/linux/regulator/fan53555.h b/include/linux/regulator/fan53555.h
index 5c45c85d52ca..f13880e84d85 100644
--- a/include/linux/regulator/fan53555.h
+++ b/include/linux/regulator/fan53555.h
@@ -11,6 +11,7 @@
  */
 
 #ifndef __FAN53555_H__
+#define __FAN53555_H__
 
 /* VSEL ID */
 enum {
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 36adbc82de6a..999b20ce06cf 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -134,6 +134,7 @@ struct regulation_constraints {
         unsigned always_on:1;   /* regulator never off when system is on */
         unsigned boot_on:1;     /* bootloader/firmware enabled regulator */
         unsigned apply_uV:1;    /* apply uV constraint if min == max */
+        unsigned ramp_disable:1; /* disable ramp delay */
 };
 
 /**
diff --git a/include/linux/regulator/max8660.h b/include/linux/regulator/max8660.h
index 9936763621c7..f8a6a4844864 100644
--- a/include/linux/regulator/max8660.h
+++ b/include/linux/regulator/max8660.h
@@ -39,7 +39,7 @@ enum {
  */
 struct max8660_subdev_data {
         int                             id;
-        char                            *name;
+        const char                      *name;
         struct regulator_init_data      *platform_data;
 };
 
diff --git a/include/linux/regulator/pfuze100.h b/include/linux/regulator/pfuze100.h
new file mode 100644
index 000000000000..65d550bf3954
--- /dev/null
+++ b/include/linux/regulator/pfuze100.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef __LINUX_REG_PFUZE100_H
+#define __LINUX_REG_PFUZE100_H
+
+#define PFUZE100_SW1AB          0
+#define PFUZE100_SW1C           1
+#define PFUZE100_SW2            2
+#define PFUZE100_SW3A           3
+#define PFUZE100_SW3B           4
+#define PFUZE100_SW4            5
+#define PFUZE100_SWBST          6
+#define PFUZE100_VSNVS          7
+#define PFUZE100_VREFDDR        8
+#define PFUZE100_VGEN1          9
+#define PFUZE100_VGEN2          10
+#define PFUZE100_VGEN3          11
+#define PFUZE100_VGEN4          12
+#define PFUZE100_VGEN5          13
+#define PFUZE100_VGEN6          14
+#define PFUZE100_MAX_REGULATOR  15
+
+struct regulator_init_data;
+
+struct pfuze_regulator_platform_data {
+        struct regulator_init_data *init_data[PFUZE100_MAX_REGULATOR];
+};
+
+#endif /* __LINUX_REG_PFUZE100_H */