rockchip: backport standard system-power-controller property support

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-09-21 20:45:14 +08:00
parent bc8745a607
commit 5fedd23972
No known key found for this signature in database
GPG Key ID: 6850B6345C862176

View File

@ -0,0 +1,28 @@
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/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -754,7 +754,8 @@ static int rk808_probe(struct i2c_client
goto err_irq;
}
- if (of_property_read_bool(np, "rockchip,system-power-controller")) {
+ if (of_property_read_bool(np, "rockchip,system-power-controller") ||
+ of_property_read_bool(np, "system-power-controller")) {
rk808_i2c_client = client;
pm_power_off = rk808_pm_power_off;