Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-isl9305

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index efe058f8f746..18f7017deaa5 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -203,6 +203,8 @@ enum regulator_type {
  *
  * @name: Identifying name for the regulator.
  * @supply_name: Identifying the regulator supply
+ * @of_match: Name used to identify regulator in DT.
+ * @regulators_node: Name of node containing regulator definitions in DT.
  * @id: Numerical identifier for the regulator.
  * @ops: Regulator operations table.
  * @irq: Interrupt number for the regulator.
@@ -243,6 +245,8 @@ enum regulator_type {
 struct regulator_desc {
         const char *name;
         const char *supply_name;
+        const char *of_match;
+        const char *regulators_node;
         int id;
         bool continuous_voltage_range;
         unsigned n_voltages;