diff options
| author | Dragan Simic <dsimic@manjaro.org> | 2024-10-08 16:30:10 +0200 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2024-10-16 09:04:11 +0100 |
| commit | 337dd40b3bac67acfd74e4d8b2d9d4886e0d0aeb (patch) | |
| tree | 574571961bd9eb29f4375b4fb5a5785271ea09e7 /drivers/mfd/rk8xx-core.c | |
| parent | 57eea9d05752283b67dd9f7bc70da37681c2d147 (diff) | |
mfd: rk8xx-core: Check "system-power-controller" first
Commit 961748bb1555 ("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: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/08d4e88974c205eba124086ce156622e2e4cdc20.1728397516.git.dsimic@manjaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/mfd/rk8xx-core.c')
| -rw-r--r-- | drivers/mfd/rk8xx-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c index c95de65c2f12..71c2b80a4678 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -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); |