diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-28 15:17:00 +0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-28 15:17:00 +0400 |
commit | fdaff15ae6cc8745b9b56adab0252729b476ed7e (patch) | |
tree | 182eb140d5c71501159fb0d46ffc8b74c766dc13 /Documentation | |
parent | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 (diff) | |
parent | 9839d627c2a2c74facde9a9ee949f2ba0a1363b1 (diff) | |
download | linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.xz |
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Makefile
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/regulator/sky81452-regulator.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt b/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt new file mode 100644 index 000000000000..882455e9b36d --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt @@ -0,0 +1,16 @@ +SKY81452 voltage regulator + +Required properties: +- any required generic properties defined in regulator.txt + +Optional properties: +- any available generic properties defined in regulator.txt + +Example: + + regulator { + /* generic regulator properties */ + regulator-name = "touch_en"; + regulator-min-microvolt = <4500000>; + regulator-max-microvolt = <8000000>; + }; |