Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

of: Rename "poweroff-source" property to "system-power-controller"

Browse source 
It reverts commit a4b4e0461e ("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>
This commit is contained in:
Romain Perier 2014-11-25 12:28:25 +00:00 committed by Mark Brown
parent 7a5f5d7b7e
commit 8f73110f6b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Documentation/devicetree/bindings/power/poweroff.txt → Documentation/devicetree/bindings/power/power-controller.txt
View file

4
Documentation/devicetree/bindings/regulator/act8865-regulator.txt
View file

@ -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.

2
drivers/regulator/act8865-regulator.c
View file

@ -365,7 +365,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
return ret;
}
if (of_system_has_poweroff_source(dev->of_node)) {
if (of_device_is_system_power_controller(dev->of_node)) {
if (!pm_power_off) {
act8865_i2c_client = client;
act8865->off_reg = off_reg;

6
include/linux/of.h
View file

@ -867,14 +867,14 @@ static inline int of_changeset_update_property(struct of_changeset *ocs,
extern int of_resolve_phandles(struct device_node *tree);
/**
* of_system_has_poweroff_source - Tells if poweroff-source is found for device_node
* of_device_is_system_power_controller - Tells if system-power-controller is found for device_node
* @np: Pointer to the given device_node
*
* return true if present false otherwise
*/
static inline bool of_system_has_poweroff_source(const struct device_node *np)
static inline bool of_device_is_system_power_controller(const struct device_node *np)
{
return of_property_read_bool(np, "poweroff-source");
return of_property_read_bool(np, "system-power-controller");
}
#endif /* _LINUX_OF_H */