[PATCH] mfd: rk808: Use standard system-power-controller property

[PATCH] mfd: rk808: Use standard system-power-controller property

[Alexander Shiyan]

The old property "rockchip,system-power-controller" marked as deprecated.

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/mfd/rk808.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index adb9d8ca0a..8f766a3fa2 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -366,7 +366,7 @@ static int rk808_probe(struct device *dev)
 	rk808->poweroff.poweroff = rk808_poweroff;
 	rk808->poweroff.priority = 200;
 
-	if (of_property_read_bool(np, "rockchip,system-power-controller"))
+	if (of_property_read_bool(np, "system-power-controller"))
 		rk808->poweroff.priority += 100;
 
 	poweroff_handler_register(&rk808->poweroff);
-- 
2.38.2

Re: [PATCH] mfd: rk808: Use standard system-power-controller property

[Ahmad Fatoum]

Hello Alexander,

Thanks for your patch.

On 24.06.24 19:50, Alexander Shiyan wrote:
> The old property "rockchip,system-power-controller" marked as deprecated.
> 
> Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
> ---
>  drivers/mfd/rk808.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> index adb9d8ca0a..8f766a3fa2 100644
> --- a/drivers/mfd/rk808.c
> +++ b/drivers/mfd/rk808.c
> @@ -366,7 +366,7 @@ static int rk808_probe(struct device *dev)
>  	rk808->poweroff.poweroff = rk808_poweroff;
>  	rk808->poweroff.priority = 200;
>  
> -	if (of_property_read_bool(np, "rockchip,system-power-controller"))
> +	if (of_property_read_bool(np, "system-power-controller"))
>  		rk808->poweroff.priority += 100;

This change is only correct when all DTs we support cease to use the deprecated
property. This is currently not the case, e.g. for rk3568-wolfvision-pf5-upstream.dts.

Until that's done, we should check both properties.

Thanks,
Ahmad

>  
>  	poweroff_handler_register(&rk808->poweroff);

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |