aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-05-12 15:49:46 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-05-12 15:49:46 -0400
commit577f8cee022d3b9f6aba93761a92c45f5ead5b8a (patch)
tree1780be8b63abf190782ee7d5453826dfbc6459db
parent6db47ab764b68ce142b0882be49a2271720a4395 (diff)
parent1c80d994d3dbdaefb429305461e95a86be5b3862 (diff)
downloadlinux-yocto-v5.10/standard/cn-sdkv5.4/octeon.tar.gz
linux-yocto-v5.10/standard/cn-sdkv5.4/octeon.tar.bz2
linux-yocto-v5.10/standard/cn-sdkv5.4/octeon.zip
Merge branch 'v5.10/standard/base' into v5.10/standard/cn-sdkv5.4/octeonv5.10/standard/cn-sdkv5.4/octeon
-rw-r--r--include/linux/regulator/consumer.h30
1 files changed, 30 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 2024944fd2f7..20e84a84fb77 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -332,6 +332,12 @@ regulator_get_exclusive(struct device *dev, const char *id)
}
static inline struct regulator *__must_check
+devm_regulator_get_exclusive(struct device *dev, const char *id)
+{
+ return ERR_PTR(-ENODEV);
+}
+
+static inline struct regulator *__must_check
regulator_get_optional(struct device *dev, const char *id)
{
return ERR_PTR(-ENODEV);
@@ -486,6 +492,11 @@ static inline int regulator_get_voltage(struct regulator *regulator)
return -EINVAL;
}
+static inline int regulator_sync_voltage(struct regulator *regulator)
+{
+ return -EINVAL;
+}
+
static inline int regulator_is_supported_voltage(struct regulator *regulator,
int min_uV, int max_uV)
{
@@ -578,6 +589,25 @@ static inline int devm_regulator_unregister_notifier(struct regulator *regulator
return 0;
}
+static inline int regulator_suspend_enable(struct regulator_dev *rdev,
+ suspend_state_t state)
+{
+ return -EINVAL;
+}
+
+static inline int regulator_suspend_disable(struct regulator_dev *rdev,
+ suspend_state_t state)
+{
+ return -EINVAL;
+}
+
+static inline int regulator_set_suspend_voltage(struct regulator *regulator,
+ int min_uV, int max_uV,
+ suspend_state_t state)
+{
+ return -EINVAL;
+}
+
static inline void *regulator_get_drvdata(struct regulator *regulator)
{
return NULL;