Skip to content

Commit 2a46cd9

Browse files
Ondrej Jirmanlag-linaro
authored andcommitted
mfd: rk8xx: Add support for standard system-power-controller property
DT property rockchip,system-power-controller is now deprecated. Signed-off-by: Ondrej Jirman <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent f0eb624 commit 2a46cd9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/mfd/rk8xx-core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,8 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap
685685
if (ret)
686686
return dev_err_probe(dev, ret, "failed to add MFD devices\n");
687687

688-
if (device_property_read_bool(dev, "rockchip,system-power-controller")) {
688+
if (device_property_read_bool(dev, "rockchip,system-power-controller") ||
689+
device_property_read_bool(dev, "system-power-controller")) {
689690
ret = devm_register_sys_off_handler(dev,
690691
SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
691692
&rk808_power_off, rk808);

0 commit comments

Comments
 (0)