projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0eb624
)
mfd: rk8xx: Add support for standard system-power-controller property
author
Ondrej Jirman
<megi@xff.cz>
Thu, 19 Oct 2023 16:57:25 +0000
(18:57 +0200)
committer
Lee Jones
<lee@kernel.org>
Wed, 1 Nov 2023 10:02:17 +0000
(10:02 +0000)
DT property rockchip,system-power-controller is now deprecated.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link:
https://lore.kernel.org/r/20231019165732.3818789-4-megi@xff.cz
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/mfd/rk8xx-core.c
patch
|
blob
|
history
diff --git
a/drivers/mfd/rk8xx-core.c
b/drivers/mfd/rk8xx-core.c
index 11a831e92da83a89f11f29a5e86ec0d8e9227825..a50a181b18e9af223d2fab94766ef23d4b465c7f 100644
(file)
--- a/
drivers/mfd/rk8xx-core.c
+++ b/
drivers/mfd/rk8xx-core.c
@@
-685,7
+685,8
@@
int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap
if (ret)
return dev_err_probe(dev, ret, "failed to add MFD devices\n");
- if (device_property_read_bool(dev, "rockchip,system-power-controller")) {
+ if (device_property_read_bool(dev, "rockchip,system-power-controller") ||
+ device_property_read_bool(dev, "system-power-controller")) {
ret = devm_register_sys_off_handler(dev,
SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
&rk808_power_off, rk808);