Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / drivers / sysreset / sysreset_syscon.c

diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 3abce7f678679ac838476f77773eabefea9e9802..f19e80e6e4f65a02ac4739557ba2a52fdbc9f8ec 100644 (file)
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
  *
  * Derived from linux/drivers/power/reset/syscon-reboot.c:
  *     Copyright (C) 2013, Applied Micro Circuits Corporation
  *     Author: Feng Kan <fkan@apm.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -15,8 +14,6 @@
 #include <sysreset.h>
 #include <syscon.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct syscon_reboot_priv {
        struct regmap *regmap;
        unsigned int offset;
@@ -55,10 +52,8 @@ int syscon_reboot_probe(struct udevice *dev)
                return -ENODEV;
        }
 
-       priv->offset = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
-                                      "offset", 0);
-       priv->mask = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
-                                      "mask", 0);
+       priv->offset = dev_read_u32_default(dev, "offset", 0);
+       priv->mask = dev_read_u32_default(dev, "mask", 0);
 
        return 0;
 }