From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Aug 2015 13:40:11 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom...
X-Git-Tag: firefly_0821_release~176^2~1211^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aaa9b649d0868725cd7536bc9017fe3956ad5393;p=firefly-linux-kernel-4.4.55.git
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
---
aaa9b649d0868725cd7536bc9017fe3956ad5393
diff --cc drivers/regulator/Makefile
index 8bc702910320,abf70a7171b9,91bf76267404,91bf76267404,91bf76267404,91bf76267404..0f8174913c17
--- a/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 f8a689ed62a5,f8a689ed62a5,f8a689ed62a5,f8a689ed62a5,2ba4a40919c8,e325d4606b62..9e0e76992be0
--- a/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)
{