gpio: aspeed: Use dev_read_addr_ptr()

Use dev_read_addr_ptr() which supports both live device tree and flat DT
backends, avoiding direct dependency on devfdt_* helpers.

No functional changes.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/gpio/gpio-aspeed-g7.c b/drivers/gpio/gpio-aspeed-g7.c
index 4607468ca05f205032c510e4277f4d69f3b14ae4..ae330173f38b7389f6a29922bd3758d7a72bd7be 100644 (file)
--- a/drivers/gpio/gpio-aspeed-g7.c
+++ b/drivers/gpio/gpio-aspeed-g7.c
@@ -131,7 +131,7 @@ static int aspeed_gpio_probe(struct udevice *dev)
 
        uc_priv->bank_name = dev->name;
        ofnode_read_u32(dev_ofnode(dev), "ngpios", &uc_priv->gpio_count);
-       priv->regs = devfdt_get_addr_ptr(dev);
+       priv->regs = dev_read_addr_ptr(dev);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c
index 4bbdec756f34d5aa33af11e060a7b065767cf8ca..d6144d5706b55d4319aa211ccc56ceb6c8dfe9d1 100644 (file)
--- a/drivers/gpio/gpio-aspeed-sgpio.c
+++ b/drivers/gpio/gpio-aspeed-sgpio.c
@@ -223,9 +223,9 @@ static int aspeed_sgpio_probe(struct udevice *dev)
        ulong apb_freq;
        int ret;
 
-       priv->base = devfdt_get_addr_ptr(dev);
-       if (IS_ERR(priv->base))
-               return PTR_ERR(priv->base);
+       priv->base = dev_read_addr_ptr(dev);
+       if (!priv->base)
+               return -EINVAL;
 
        priv->pdata = (const struct aspeed_sgpio_pdata *)dev_get_driver_data(dev);
        if (!priv->pdata)

diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
index c5608f4a9dfcc04183f829b0703d0f30ac839772..54a786c4dc04b77ee8b6aff691d9592d0d28ed61 100644 (file)
--- a/drivers/gpio/gpio-aspeed.c
+++ b/drivers/gpio/gpio-aspeed.c
@@ -275,7 +275,7 @@ static int aspeed_gpio_probe(struct udevice *dev)
 
        uc_priv->bank_name = dev->name;
        ofnode_read_u32(dev_ofnode(dev), "ngpios", &uc_priv->gpio_count);
-       priv->regs = devfdt_get_addr_ptr(dev);
+       priv->regs = dev_read_addr_ptr(dev);
 
        return 0;
 }