Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / include / linux / regulator / consumer.h

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
old mode 100644 (file)
new mode 100755 (executable)
index ebd7472..76650be
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -153,6 +153,9 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector);
 int regulator_is_supported_voltage(struct regulator *regulator,
                                   int min_uV, int max_uV);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
+#ifdef CONFIG_ARCH_RK29
+int regulator_set_suspend_voltage(struct regulator *regulator, int uV);
+#endif
 int regulator_get_voltage(struct regulator *regulator);
 int regulator_set_current_limit(struct regulator *regulator,
                               int min_uA, int max_uA);
@@ -240,6 +243,13 @@ static inline int regulator_set_voltage(struct regulator *regulator,
        return 0;
 }
 
+#ifdef CONFIG_ARCH_RK29
+static inline int regulator_set_suspend_voltage(struct regulator *regulator, int uV)
+{
+       return 0;
+}
+#endif
+
 static inline int regulator_get_voltage(struct regulator *regulator)
 {
        return 0;