c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 2a46cd97f401a669d71b3d36b78bd6653f8424ee Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Thu, 19 Oct 2023 18:57:25 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/mfd/rk8xx-core.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mfd/rk8xx-core.c
|
|
+++ b/drivers/mfd/rk8xx-core.c
|
|
@@ -677,7 +677,8 @@ int rk8xx_probe(struct device *dev, int
|
|
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);
|