git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 2a46cd97f401a669d71b3d36b78bd6653f8424ee Mon Sep 17 00:00:00 2001
   2 From: Ondrej Jirman <megi@xff.cz>
   3 Date: Thu, 19 Oct 2023 18:57:25 +0200
   4 Subject: [PATCH] mfd: rk8xx: Add support for standard system-power-controller
   5  property
   6
   7 DT property rockchip,system-power-controller is now deprecated.
   8
   9 Signed-off-by: Ondrej Jirman <megi@xff.cz>
  10 Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  11 Link: https://lore.kernel.org/r/20231019165732.3818789-4-megi@xff.cz
  12 Signed-off-by: Lee Jones <lee@kernel.org>
  13 ---
  14  drivers/mfd/rk8xx-core.c | 3 ++-
  15  1 file changed, 2 insertions(+), 1 deletion(-)
  16
  17 --- a/drivers/mfd/rk8xx-core.c
  18 +++ b/drivers/mfd/rk8xx-core.c
  19 @@ -677,7 +677,8 @@ int rk8xx_probe(struct device *dev, int
  20         if (ret)
  21                 return dev_err_probe(dev, ret, "failed to add MFD devices\n");
  22
  23 -       if (device_property_read_bool(dev, "rockchip,system-power-controller")) {
  24 +       if (device_property_read_bool(dev, "rockchip,system-power-controller") ||
  25 +           device_property_read_bool(dev, "system-power-controller")) {
  26                 ret = devm_register_sys_off_handler(dev,
  27                                     SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
  28                                     &rk808_power_off, rk808);