diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-10 15:03:23 +0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-10 15:03:23 +0400 |
commit | 3f7c69637511a39f4400dc8312bbcecaa592ab61 (patch) | |
tree | 1d1baaae31beddcbe30177f42023132517711751 /include/linux/regulator | |
parent | dec38b5ce6a9edb406c60c2670b26a1a4262fdb9 (diff) | |
parent | a0c7b164ad115ec0556dc0904ee2218cbc5cedfa (diff) | |
download | linux-3f7c69637511a39f4400dc8312bbcecaa592ab61.tar.xz |
Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-isl9305
Diffstat (limited to 'include/linux/regulator')
-rw-r--r-- | include/linux/regulator/driver.h | 4 |
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; |