aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRomain Perier <romain.perier@gmail.com>2014-11-25 12:28:25 +0000
committerMark Brown <broonie@kernel.org>2014-12-01 19:33:44 +0000
commit8f73110f6bac043026bc923b0a66abe24dd48058 (patch)
tree77fe0fd9bed38af5153ac43baa264b2e931c64a7 /Documentation
parentdt-bindings: Document the property poweroff-source for act8865 regulator (diff)
downloadlinux-dev-8f73110f6bac043026bc923b0a66abe24dd48058.tar.xz
linux-dev-8f73110f6bac043026bc923b0a66abe24dd48058.zip
of: Rename "poweroff-source" property to "system-power-controller"
It reverts commit a4b4e0461ec5 ("of: Add standard property for poweroff capability"). As discussed on the mailing list, it makes more sense to rename back to the old established property name, without the vendor prefix. Problem being that the word "source" usually tends to be used for inputs and that is out of control of the OS. The poweroff capability is an output which simply turns the system-power off. Also, this property might be used by drivers which power-off the system and power back on subsequent RTC alarms. This seems to suggest to remove "poweroff" from the property name and to choose "system-power-controller" as the more generic name. This patchs adds the required renaming changes and defines an helper function which checks if this property is set. Signed-off-by: Romain Perier <romain.perier@gmail.com> Acked-by: Grant Likely <grant.likely@linaro.org> Acked-by: Johan Hovold <johan@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/power/power-controller.txt (renamed from Documentation/devicetree/bindings/power/poweroff.txt)0
-rw-r--r--Documentation/devicetree/bindings/regulator/act8865-regulator.txt4
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/power/poweroff.txt b/Documentation/devicetree/bindings/power/power-controller.txt
index 845868bf3273..845868bf3273 100644
--- a/Documentation/devicetree/bindings/power/poweroff.txt
+++ b/Documentation/devicetree/bindings/power/power-controller.txt
diff --git a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
index 01a5b0766e53..dad6358074ac 100644
--- a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
@@ -6,8 +6,8 @@ Required properties:
- reg: I2C slave address
Optional properties:
-- poweroff-source: Telling whether or not this pmic is controlling
- the system power. See Documentation/devicetree/bindings/power/poweroff.txt .
+- system-power-controller: Telling whether or not this pmic is controlling
+ the system power. See Documentation/devicetree/bindings/power/power-controller.txt .
Any standard regulator properties can be used to configure the single regulator.