[PATCH 1/5] pci: rcar: Use dev_read_addr_index()

[Neil Armstrong]

On 5/26/26 10:09, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan at nxp.com>
> 
> Use dev_read_addr_index() which supports both live device tree and flat DT
> backends, avoiding direct dependency on devfdt_* helpers.
> 
> While at here, correct the return value check.
> 
> No functional changes.
> 
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>   drivers/pci/pci-rcar-gen2.c | 7 ++++---
>   drivers/pci/pci-rcar-gen3.c | 5 +++--
>   2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
> index 08d5c4fbb8b..53cb0916741 100644
> --- a/drivers/pci/pci-rcar-gen2.c
> +++ b/drivers/pci/pci-rcar-gen2.c
> @@ -10,6 +10,7 @@
>   #include <clk.h>
>   #include <dm.h>
>   #include <errno.h>
> +#include <fdtdec.h>
>   #include <pci.h>
>   #include <linux/bitops.h>
>   
> @@ -235,9 +236,9 @@ static int rcar_gen2_pci_of_to_plat(struct udevice *dev)
>   {
>   	struct rcar_gen2_pci_priv *priv = dev_get_priv(dev);
>   
> -	priv->cfg_base = devfdt_get_addr_index(dev, 0);
> -	priv->mem_base = devfdt_get_addr_index(dev, 1);
> -	if (!priv->cfg_base || !priv->mem_base)
> +	priv->cfg_base = dev_read_addr_index(dev, 0);
> +	priv->mem_base = dev_read_addr_index(dev, 1);
> +	if (priv->cfg_base == FDT_ADDR_T_NONE || priv->mem_base == FDT_ADDR_T_NONE)
>   		return -EINVAL;
>   
>   	return 0;
> diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
> index d4b4037ce19..1925d968c16 100644
> --- a/drivers/pci/pci-rcar-gen3.c
> +++ b/drivers/pci/pci-rcar-gen3.c
> @@ -19,6 +19,7 @@
>   #include <clk.h>
>   #include <dm.h>
>   #include <errno.h>
> +#include <fdtdec.h>
>   #include <pci.h>
>   #include <wait_bit.h>
>   #include <linux/bitops.h>
> @@ -391,8 +392,8 @@ static int rcar_gen3_pcie_of_to_plat(struct udevice *dev)
>   {
>   	struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev);
>   
> -	priv->regs = devfdt_get_addr_index(dev, 0);
> -	if (!priv->regs)
> +	priv->regs = dev_read_addr_index(dev, 0);
> +	if (priv->regs == FDT_ADDR_T_NONE)
>   		return -EINVAL;
>   
>   	return 0;
> 

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>

Thanks,
Neil