Commit 337dd40b authored by Dragan Simic's avatar Dragan Simic Committed by Lee Jones
Browse files

mfd: rk8xx-core: Check "system-power-controller" first 

Commit 961748bb ("dt-bindings: mfd: rk8xx: Deprecate rockchip,system-
power-controller") made the property "rockchip,system-power-controller"
deprecated in favor of the shorter, universal form "system-power-controller".
Following the updates to the board dts files, [1] make the favored property
name checked first, to save a few CPU cycles.

[1] https://lore.kernel.org/linux-rockchip/20241008105450.20648-1-didi.debian@cknow.org/T/#u



Signed-off-by: default avatarDragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/08d4e88974c205eba124086ce156622e2e4cdc20.1728397516.git.dsimic@manjaro.org


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 57eea9d0

drivers/mfd/rk8xx-core.c

+2 −2
Original line number Diff line number Diff line
@@ -785,8 +785,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") ||

	    device_property_read_bool(dev, "system-power-controller")) {

	if (device_property_read_bool(dev, "system-power-controller") ||

	    device_property_read_bool(dev, "rockchip,system-power-controller")) {

		ret = devm_register_sys_off_handler(dev,

				    SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,

				    &rk808_power_off, rk808);