diff --git a/drivers/gpio/gpio-aspeed-g7.c b/drivers/gpio/gpio-aspeed-g7.c
index 4607468ca05..ae330173f38 100644
--- 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 4bbdec756f3..d6144d5706b 100644
--- 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 c5608f4a9df..54a786c4dc0 100644
--- 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;
 }