]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
sysreset: syscon: Don't assume default value for offset and mask property
authorBin Meng <bin.meng@windriver.com>
Tue, 23 Jun 2020 05:29:42 +0000 (22:29 -0700)
committerAndes <uboot@andestech.com>
Fri, 24 Jul 2020 06:55:43 +0000 (14:55 +0800)
Per the DT binding, <offset> is a required property. Let's abort
the probe if it is missing. For the <mask> property, current codes
assume a default value of zero, which is not correct either.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
drivers/sysreset/sysreset_syscon.c

index f64701aab3c834ad967a30f04b1ef3ca0a217e81..caf24823cc192f8fe533c15497702375553a3c26 100644 (file)
@@ -41,6 +41,7 @@ static struct sysreset_ops syscon_reboot_ops = {
 int syscon_reboot_probe(struct udevice *dev)
 {
        struct syscon_reboot_priv *priv = dev_get_priv(dev);
+       int err;
 
        priv->regmap = syscon_regmap_lookup_by_phandle(dev, "regmap");
        if (IS_ERR(priv->regmap)) {
@@ -48,8 +49,17 @@ int syscon_reboot_probe(struct udevice *dev)
                return -ENODEV;
        }
 
-       priv->offset = dev_read_u32_default(dev, "offset", 0);
-       priv->mask = dev_read_u32_default(dev, "mask", 0);
+       err = dev_read_u32(dev, "offset", &priv->offset);
+       if (err) {
+               pr_err("unable to find offset\n");
+               return -ENOENT;
+       }
+
+       err = dev_read_u32(dev, "mask", &priv->mask);
+       if (err) {
+               pr_err("unable to find mask\n");
+               return -ENOENT;
+       }
 
        return 0;
 }