aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorOndrej Jirman <megi@xff.cz>2023-10-19 18:57:25 +0200
committerLee Jones <lee@kernel.org>2023-11-01 10:02:17 +0000
commit2a46cd97f401a669d71b3d36b78bd6653f8424ee (patch)
tree0fc44e2031f370b65f79c41a513f6ac3c46ddd0a /drivers/mfd
parentf0eb624455426cf7ddb453c4e5204b388d134c2e (diff)
downloadlinux-2a46cd97f401a669d71b3d36b78bd6653f8424ee.tar.gz
mfd: rk8xx: Add support for standard system-power-controller property
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/rk8xx-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index 11a831e92da83..a50a181b18e9a 100644
--- 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);