From: Romain Perier <romain.perier@gmail.com>
To: heiko@sntech.de
Cc: grant.likely@linaro.org, robh+dt@kernel.org,
devicetree@vger.kernel.org, lgirdwood@gmail.com,
broonie@kernel.org, johan@kernel.org, mark.rutland@arm.com,
linux-pm@vger.kernel.org
Subject: [PATCH v2 2/4] regulator: act8865: Convert poweroff-source DT property to system-power-controller
Date: Wed, 29 Oct 2014 07:35:33 +0000 [thread overview]
Message-ID: <1414568135-8311-3-git-send-email-romain.perier@gmail.com> (raw)
In-Reply-To: <1414568135-8311-1-git-send-email-romain.perier@gmail.com>
Signed-off-by: Romain Perier <romain.perier@gmail.com>
---
Documentation/devicetree/bindings/regulator/act8865-regulator.txt | 4 ++--
drivers/regulator/act8865-regulator.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
index 01a5b07..dad6358 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.
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index 76301ed..435aba1 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -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_is_system_power_controller(dev->of_node)) {
if (!pm_power_off) {
act8865_i2c_client = client;
act8865->off_reg = off_reg;
--
1.9.1
next prev parent reply other threads:[~2014-10-29 7:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-29 7:35 [PATCH 0/4] poweroff-source DT property renaming Romain Perier
2014-10-29 7:35 ` [PATCH v2 1/4] of: Rename "poweroff-source" property to "system-power-controller" Romain Perier
2014-10-30 10:08 ` Romain Perier
2014-11-04 8:21 ` Romain Perier
2014-11-05 9:42 ` Johan Hovold
2014-11-05 10:08 ` Johan Hovold
2014-11-05 16:19 ` Romain Perier
2014-11-05 17:35 ` Grant Likely
2014-10-29 7:35 ` Romain Perier [this message]
2014-10-29 7:35 ` [PATCH v2 3/4] mfd: tps65910: Convert poweroff-source DT property to system-power-controller Romain Perier
2014-10-29 7:35 ` [PATCH v1 4/4] of: Remove of_system_has_poweroff_source helper function Romain Perier
2014-10-29 14:21 ` [PATCH 0/4] poweroff-source DT property renaming Romain Perier
2014-11-05 9:39 ` Johan Hovold
2014-11-05 15:53 ` Romain Perier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414568135-8311-3-git-send-email-romain.perier@gmail.com \
--to=romain.perier@gmail.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=heiko@sntech.de \
--cc=johan@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).