Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / drivers / sysreset / sysreset_syscon.c

diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 22c602a..1028160 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>
@@ -25,6 +24,9 @@ static int syscon_reboot_request(struct udevice *dev, enum sysreset_t type)
 {
        struct syscon_reboot_priv *priv = dev_get_priv(dev);
 
+       if (type == SYSRESET_POWER)
+               return -EPROTONOSUPPORT;
+
        regmap_write(priv->regmap, priv->offset, priv->mask);
 
        return -EINPROGRESS;
@@ -36,19 +38,10 @@ static struct sysreset_ops syscon_reboot_ops = {
 
 int syscon_reboot_probe(struct udevice *dev)
 {
-       struct udevice *syscon;
        struct syscon_reboot_priv *priv = dev_get_priv(dev);
-       int err;
-
-       err = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,
-                                          "regmap", &syscon);
-       if (err) {
-               pr_err("unable to find syscon device\n");
-               return err;
-       }
 
-       priv->regmap = syscon_get_regmap(syscon);
-       if (!priv->regmap) {
+       priv->regmap = syscon_regmap_lookup_by_phandle(dev, "regmap");
+       if (IS_ERR(priv->regmap)) {
                pr_err("unable to find regmap\n");
                return -ENODEV;
        }