projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[linux-2.6-block.git]
/
drivers
/
mfd
/
twl4030-power.c
diff --git
a/drivers/mfd/twl4030-power.c
b/drivers/mfd/twl4030-power.c
index 4d3ff37714916451903f39aa30d47ab46e0f4d62..cf92a6d1c532ac578d6bd9d042f4d1e8ebe55e7c 100644
(file)
--- 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;