summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-09-17 07:34:12 -0500
committerLee Jones <lee.jones@linaro.org>2014-09-26 08:23:58 +0100
commitfecc4452b9b3f4bbab41c1b7583a72066ee0c77c (patch)
treebca15a2e905b21c3635c3e73c1f671ee4255e622
parentb64c6887f44d9e9220ddf10acf5c0c6b313a9de1 (diff)
downloadlinux-stable-fecc4452b9b3f4bbab41c1b7583a72066ee0c77c.tar.gz
linux-stable-fecc4452b9b3f4bbab41c1b7583a72066ee0c77c.tar.bz2
linux-stable-fecc4452b9b3f4bbab41c1b7583a72066ee0c77c.zip
mfd: twl4030-power: Use 'ti,system-power-controller' as alternative way to support system power off
ti,system-power-controller is more or less the standard way of indicating that the PMIC is the system wide power controller and hence may be used to switch off the system. Almost ALL TI PMIC drivers and many Maxim PMIC drivers follow the same style. So support 'ti,system-power-controller' in addition to the usual 'ti,use_poweroff' to indicate that the PMIC instance has control for switching off the system. Signed-off-by: Nishanth Menon <nm@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/twl4030-power.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 3bc969a5916b..1c129ba68dde 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -627,6 +627,9 @@ static bool twl4030_power_use_poweroff(const struct twl4030_power_data *pdata,
if (pdata && pdata->use_poweroff)
return true;
+ if (of_property_read_bool(node, "ti,system-power-controller"))
+ return true;
+
if (of_property_read_bool(node, "ti,use_poweroff"))
return true;