Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
index 8bc702910320532df667f98acc33de146f4ff57b,abf70a7171b91d4bc28b0e2a5dbc124ac14648ec,91bf76267404c9b8a9260dba5e0a0c8a793247e6,91bf76267404c9b8a9260dba5e0a0c8a793247e6,91bf76267404c9b8a9260dba5e0a0c8a793247e6,91bf76267404c9b8a9260dba5e0a0c8a793247e6..0f8174913c17bd0b23fb434af7e0a48206680e85
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
--- 5/drivers/regulator/Makefile
--- 6/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@ -59,9 -59,10 -59,9 -59,9 -59,9 -59,9 +59,10 @@@@@@@ obj-$(CONFIG_REGULATOR_MAX77802) += max
      obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
      obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
      obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 +++++obj-$(CONFIG_REGULATOR_MT6311) += mt6311-regulator.o
      obj-$(CONFIG_REGULATOR_MT6397)    += mt6397-regulator.o
      obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
+ ++++obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
      obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
      obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
      obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o

diff --cc include/linux/regulator/consumer.h
index f8a689ed62a58753cb3d4863f61d834cdca74f62,f8a689ed62a58753cb3d4863f61d834cdca74f62,f8a689ed62a58753cb3d4863f61d834cdca74f62,f8a689ed62a58753cb3d4863f61d834cdca74f62,2ba4a40919c8def0d73d766c2926db3793c0f5fc,e325d4606b62c041b9ff416f14161fe8d6207abe..9e0e76992be082f68ba6651207fc8b7a4f9bc976
--- 1/include/linux/regulator/consumer.h
--- 2/include/linux/regulator/consumer.h
--- 3/include/linux/regulator/consumer.h
--- 4/include/linux/regulator/consumer.h
--- 5/include/linux/regulator/consumer.h
--- 6/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@@@@@@ -550,8 -550,8 -550,8 -550,8 -550,14 -550,18 +550,24 @@@@@@@ static inline int regulator_count_volta
      {
        return 0;
      }
++++ +
++++ +static inline int regulator_list_voltage(struct regulator *regulator, unsigned selector)
++++ +{
++++ +  return -EINVAL;
++++ +}
++++ +
      #endif
      
+++++ static inline int regulator_set_voltage_triplet(struct regulator *regulator,
+++++                                           int min_uV, int target_uV,
+++++                                           int max_uV)
+++++ {
+++++   if (regulator_set_voltage(regulator, target_uV, max_uV) == 0)
+++++           return 0;
+++++ 
+++++   return regulator_set_voltage(regulator, min_uV, max_uV);
+++++ }
+++++ 
      static inline int regulator_set_voltage_tol(struct regulator *regulator,
                                            int new_uV, int tol_uV)
      {