From: Peng Fan <[email protected]> Use dev_read_addr_size_name() which supports both live device tree and flat DT backends, avoiding direct dependency on devfdt_* helpers.
Also correct type of size to 'fdt_size_t'. No functional changes. Signed-off-by: Peng Fan <[email protected]> --- drivers/spi/nxp_fspi.c | 8 ++++---- drivers/spi/nxp_xspi.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 46de915c238..d3575cbb9b8 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -1050,20 +1050,20 @@ static int nxp_fspi_of_to_plat(struct udevice *bus) #endif fdt_addr_t iobase; - fdt_addr_t iobase_size; + fdt_size_t iobase_size; fdt_addr_t ahb_addr; - fdt_addr_t ahb_size; + fdt_size_t ahb_size; f->dev = bus; - iobase = devfdt_get_addr_size_name(bus, "fspi_base", &iobase_size); + iobase = dev_read_addr_size_name(bus, "fspi_base", &iobase_size); if (iobase == FDT_ADDR_T_NONE) { dev_err(bus, "fspi_base regs missing\n"); return -ENODEV; } f->iobase = map_physmem(iobase, iobase_size, MAP_NOCACHE); - ahb_addr = devfdt_get_addr_size_name(bus, "fspi_mmap", &ahb_size); + ahb_addr = dev_read_addr_size_name(bus, "fspi_mmap", &ahb_size); if (ahb_addr == FDT_ADDR_T_NONE) { dev_err(bus, "fspi_mmap regs missing\n"); return -ENODEV; diff --git a/drivers/spi/nxp_xspi.c b/drivers/spi/nxp_xspi.c index 200138f5adf..7ba3f00e506 100644 --- a/drivers/spi/nxp_xspi.c +++ b/drivers/spi/nxp_xspi.c @@ -711,9 +711,9 @@ static int nxp_xspi_of_to_plat(struct udevice *bus) { struct nxp_xspi *x = dev_get_priv(bus); fdt_addr_t iobase; - fdt_addr_t iobase_size; + fdt_size_t iobase_size; fdt_addr_t ahb_addr; - fdt_addr_t ahb_size; + fdt_size_t ahb_size; #if CONFIG_IS_ENABLED(CLK) int ret; @@ -721,14 +721,14 @@ static int nxp_xspi_of_to_plat(struct udevice *bus) x->dev = bus; - iobase = devfdt_get_addr_size_name(bus, "xspi_base", &iobase_size); + iobase = dev_read_addr_size_name(bus, "xspi_base", &iobase_size); if (iobase == FDT_ADDR_T_NONE) { dev_err(bus, "xspi_base regs missing\n"); return -ENODEV; } x->iobase = iobase; - ahb_addr = devfdt_get_addr_size_name(bus, "xspi_mmap", &ahb_size); + ahb_addr = dev_read_addr_size_name(bus, "xspi_mmap", &ahb_size); if (ahb_addr == FDT_ADDR_T_NONE) { dev_err(bus, "xspi_mmap regs missing\n"); return -ENODEV; -- 2.51.0
