Merge remote-tracking branch 'regulator/topic/alias' into regulator-next

2 files changed, 84 insertions, 0 deletions

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 27be915caa96..e530681bea70 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -146,6 +146,32 @@ struct regulator *__must_check devm_regulator_get_optional(struct device *dev,
 void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 
+int regulator_register_supply_alias(struct device *dev, const char *id,
+                                    struct device *alias_dev,
+                                    const char *alias_id);
+void regulator_unregister_supply_alias(struct device *dev, const char *id);
+
+int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
+                                         struct device *alias_dev,
+                                         const char **alias_id, int num_id);
+void regulator_bulk_unregister_supply_alias(struct device *dev,
+                                            const char **id, int num_id);
+
+int devm_regulator_register_supply_alias(struct device *dev, const char *id,
+                                         struct device *alias_dev,
+                                         const char *alias_id);
+void devm_regulator_unregister_supply_alias(struct device *dev,
+                                            const char *id);
+
+int devm_regulator_bulk_register_supply_alias(struct device *dev,
+                                              const char **id,
+                                              struct device *alias_dev,
+                                              const char **alias_id,
+                                              int num_id);
+void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
+                                                 const char **id,
+                                                 int num_id);
+
 /* regulator output control and status */
 int __must_check regulator_enable(struct regulator *regulator);
 int regulator_disable(struct regulator *regulator);
@@ -250,6 +276,59 @@ static inline void devm_regulator_put(struct regulator *regulator)
 {
 }
 
+static inline int regulator_register_supply_alias(struct device *dev,
+                                                  const char *id,
+                                                  struct device *alias_dev,
+                                                  const char *alias_id)
+{
+        return 0;
+}
+
+static inline void regulator_unregister_supply_alias(struct device *dev,
+                                                    const char *id)
+{
+}
+
+static inline int regulator_bulk_register_supply_alias(struct device *dev,
+                                                       const char **id,
+                                                       struct device *alias_dev,
+                                                       const char **alias_id,
+                                                       int num_id)
+{
+        return 0;
+}
+
+static inline void regulator_bulk_unregister_supply_alias(struct device *dev,
+                                                          const char **id,
+                                                          int num_id)
+{
+}
+
+static inline int devm_regulator_register_supply_alias(struct device *dev,
+                                                       const char *id,
+                                                       struct device *alias_dev,
+                                                       const char *alias_id)
+{
+        return 0;
+}
+
+static inline void devm_regulator_unregister_supply_alias(struct device *dev,
+                                                          const char *id)
+{
+}
+
+static inline int devm_regulator_bulk_register_supply_alias(
+                struct device *dev, const char **id, struct device *alias_dev,
+                const char **alias_id, int num_id)
+{
+        return 0;
+}
+
+static inline void devm_regulator_bulk_unregister_supply_alias(
+                struct device *dev, const char **id, int num_id)
+{
+}
+
 static inline int regulator_enable(struct regulator *regulator)
 {
         return 0;
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 9bdad43ad228..779b877e0fa1 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -336,7 +336,12 @@ struct regulator_dev {
 struct regulator_dev *
 regulator_register(const struct regulator_desc *regulator_desc,
                    const struct regulator_config *config);
+struct regulator_dev *
+devm_regulator_register(struct device *dev,
+                        const struct regulator_desc *regulator_desc,
+                        const struct regulator_config *config);
 void regulator_unregister(struct regulator_dev *rdev);
+void devm_regulator_unregister(struct device *dev, struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,
                                   unsigned long event, void *data);