]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
reset: ast: Use dev_read_addr_ptr()
authorPeng Fan <peng.fan@nxp.com>
Tue, 26 May 2026 06:48:01 +0000 (14:48 +0800)
committerTom Rini <trini@konsulko.com>
Tue, 9 Jun 2026 20:53:34 +0000 (14:53 -0600)
Use dev_read_addr_ptr() which supports both live device tree and flat DT
backends, avoiding direct dependency on devfdt_* helpers.

While at here, correct error return value, when priv->scu is NULL,
PTR_ERR(priv->scu) is 0 which implies success. Change to return '-EINVAL'.

No functional changes.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
drivers/reset/reset-ast2500.c
drivers/reset/reset-ast2600.c

index 39b3d025713e7fc5f1a51f7affd6af8d556af590..c85906bbeb5a75eff4079a400446aa9dc1850bbf 100644 (file)
@@ -77,10 +77,10 @@ static int ast2500_reset_probe(struct udevice *dev)
                return rc;
        }
 
-       priv->scu = devfdt_get_addr_ptr(scu_dev);
+       priv->scu = dev_read_addr_ptr(scu_dev);
        if (IS_ERR_OR_NULL(priv->scu)) {
                debug("%s: invalid SCU base pointer\n", __func__);
-               return PTR_ERR(priv->scu);
+               return -EINVAL;
        }
 
        return 0;
index 9b77f6c2b71546c083f3cc517fa05b779fdd9e02..71b6220225ada59dd3ad34483aae1104d28ef0af 100644 (file)
@@ -76,10 +76,10 @@ static int ast2600_reset_probe(struct udevice *dev)
                return rc;
        }
 
-       priv->scu = devfdt_get_addr_ptr(scu_dev);
+       priv->scu = dev_read_addr_ptr(scu_dev);
        if (IS_ERR_OR_NULL(priv->scu)) {
                debug("%s: invalid SCU base pointer\n", __func__);
-               return PTR_ERR(priv->scu);
+               return -EINVAL;
        }
 
        return 0;