diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-10 12:02:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-10 12:02:41 +0100 |
| commit | dc1e0b1db4e14b6e15674113c99dc75adf093d34 (patch) | |
| tree | 7140fd8fd920dffe2ef0ee218c0fe422d8960737 /include/linux | |
| parent | c2542d2a867c22540c8ad64883288eabb891568d (diff) | |
| parent | a0c7b164ad115ec0556dc0904ee2218cbc5cedfa (diff) | |
Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-tps65217
Diffstat (limited to 'include/linux')
| -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 bbe03a1924c0..c35f5f97a147 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. @@ -242,6 +244,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; |
