dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-29 22:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

sysreset: syscon: Don't assume default value for offset and mask property

Browse Source 
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>
This commit is contained in:
Bin Meng
2020-06-22 22:29:42 -07:00
committed by Andes
parent 265d46ba13
commit 1ce8182b0f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/sysreset/sysreset_syscon.c
View File

@@ -41,6 +41,7 @@ static struct sysreset_ops syscon_reboot_ops = {
int syscon_reboot_probe(struct udevice *dev) int syscon_reboot_probe(struct udevice *dev)
{ {
struct syscon_reboot_priv *priv = dev_get_priv(dev); struct syscon_reboot_priv *priv = dev_get_priv(dev);
int err;
priv->regmap = syscon_regmap_lookup_by_phandle(dev, "regmap"); priv->regmap = syscon_regmap_lookup_by_phandle(dev, "regmap");
if (IS_ERR(priv->regmap)) { if (IS_ERR(priv->regmap)) {
@@ -48,8 +49,17 @@ int syscon_reboot_probe(struct udevice *dev)
return -ENODEV; return -ENODEV;
} }
priv->offset = dev_read_u32_default(dev, "offset", 0); err = dev_read_u32(dev, "offset", &priv->offset);
priv->mask = dev_read_u32_default(dev, "mask", 0); 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; return 0;
} }