treewide: convert devfdt_get_addr() to dev_read_addr()
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 17 Jul 2020 05:36:48 +0000 (14:36 +0900)
committerSimon Glass <sjg@chromium.org>
Sat, 25 Jul 2020 20:46:57 +0000 (14:46 -0600)
When you enable CONFIG_OF_LIVE, you will end up with a lot of
conversions.

To generate this commit, I used coccinelle excluding drivers/core/,
include/dm/, and test/

The semantic patch that makes this change is as follows:

  <smpl>
  @@
  expression dev;
  @@
  -devfdt_get_addr(dev)
  +dev_read_addr(dev)
  </smpl>

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
120 files changed:
arch/arm/mach-snapdragon/clock-snapdragon.c
arch/arm/mach-snapdragon/pinctrl-snapdragon.c
drivers/ata/dwc_ahci.c
drivers/clk/altera/clk-agilex.c
drivers/clk/altera/clk-arria10.c
drivers/clk/exynos/clk-exynos7420.c
drivers/clk/uniphier/clk-uniphier-core.c
drivers/dma/ti-edma3.c
drivers/gpio/altera_pio.c
drivers/gpio/atmel_pio4.c
drivers/gpio/bcm2835_gpio.c
drivers/gpio/da8xx_gpio.c
drivers/gpio/gpio-rza1.c
drivers/gpio/gpio-uniphier.c
drivers/gpio/msm_gpio.c
drivers/gpio/mxc_gpio.c
drivers/gpio/mxs_gpio.c
drivers/gpio/omap_gpio.c
drivers/gpio/pm8916_gpio.c
drivers/gpio/s5p_gpio.c
drivers/gpio/sifive-gpio.c
drivers/gpio/vybrid_gpio.c
drivers/i2c/i2c-uniphier-f.c
drivers/i2c/i2c-uniphier.c
drivers/i2c/imx_lpi2c.c
drivers/i2c/iproc_i2c.c
drivers/i2c/mxc_i2c.c
drivers/i2c/omap24xx_i2c.c
drivers/mailbox/tegra-hsp.c
drivers/misc/altera_sysid.c
drivers/misc/imx8/scu.c
drivers/misc/microchip_flexcom.c
drivers/mmc/bcm2835_sdhci.c
drivers/mmc/bcm2835_sdhost.c
drivers/mmc/bcmstb_sdhci.c
drivers/mmc/jz_mmc.c
drivers/mmc/meson_gx_mmc.c
drivers/mmc/omap_hsmmc.c
drivers/mmc/sdhci-cadence.c
drivers/mmc/sh_mmcif.c
drivers/mmc/sh_sdhi.c
drivers/mmc/tangier_sdhci.c
drivers/mmc/tmio-common.c
drivers/net/ag7xxx.c
drivers/net/dwc_eth_qos.c
drivers/net/ethoc.c
drivers/net/fec_mxc.c
drivers/net/fsl_mcdmafec.c
drivers/net/ftgmac100.c
drivers/net/ftmac100.c
drivers/net/ks8851_mll.c
drivers/net/mcffec.c
drivers/net/mtk_eth.c
drivers/net/mvgbe.c
drivers/net/mvneta.c
drivers/net/ravb.c
drivers/net/sh_eth.c
drivers/net/smc911x.c
drivers/net/sni_ave.c
drivers/net/sun8i_emac.c
drivers/net/sunxi_emac.c
drivers/net/ti/keystone_net.c
drivers/net/xilinx_axi_emac.c
drivers/net/xilinx_emaclite.c
drivers/pinctrl/ath79/pinctrl_ar933x.c
drivers/pinctrl/ath79/pinctrl_qca953x.c
drivers/pinctrl/exynos/pinctrl-exynos.c
drivers/pinctrl/pinctrl-at91-pio4.c
drivers/pinctrl/renesas/pfc-r7s72100.c
drivers/pinctrl/renesas/pfc.c
drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
drivers/reset/reset-uniphier.c
drivers/rtc/mvrtc.c
drivers/serial/altera_jtag_uart.c
drivers/serial/altera_uart.c
drivers/serial/atmel_usart.c
drivers/serial/serial_ar933x.c
drivers/serial/serial_bcm283x_mu.c
drivers/serial/serial_lpuart.c
drivers/serial/serial_mcf.c
drivers/serial/serial_meson.c
drivers/serial/serial_msm.c
drivers/serial/serial_mxc.c
drivers/serial/serial_pl01x.c
drivers/serial/serial_s5p.c
drivers/serial/serial_sh.c
drivers/serial/serial_sti_asc.c
drivers/serial/serial_stm32.c
drivers/serial/serial_uniphier.c
drivers/spi/altera_spi.c
drivers/spi/atcspi200_spi.c
drivers/spi/ath79_spi.c
drivers/spi/cf_spi.c
drivers/spi/davinci_spi.c
drivers/spi/fsl_dspi.c
drivers/spi/mxc_spi.c
drivers/spi/omap3_spi.c
drivers/spi/spi-sunxi.c
drivers/spi/tegra20_sflash.c
drivers/spi/tegra20_slink.c
drivers/spi/ti_qspi.c
drivers/spi/zynqmp_gqspi.c
drivers/spmi/spmi-msm.c
drivers/timer/ag101p_timer.c
drivers/timer/altera_timer.c
drivers/timer/atcpit100_timer.c
drivers/timer/omap-timer.c
drivers/usb/dwc3/dwc3-uniphier.c
drivers/usb/host/ehci-atmel.c
drivers/usb/host/ehci-exynos.c
drivers/usb/host/ehci-fsl.c
drivers/usb/host/ehci-marvell.c
drivers/usb/host/xhci-exynos5.c
drivers/usb/host/xhci-fsl.c
drivers/usb/host/xhci-mvebu.c
drivers/usb/host/xhci-rcar.c
drivers/video/exynos/exynos_dp.c
drivers/video/exynos/exynos_fb.c
drivers/w1/mxc_w1.c
drivers/watchdog/stm32mp_wdt.c

index 8552618..69d65c8 100644 (file)
@@ -114,7 +114,7 @@ static int msm_clk_probe(struct udevice *dev)
 {
        struct msm_clk_priv *priv = dev_get_priv(dev);
 
-       priv->base = devfdt_get_addr(dev);
+       priv->base = dev_read_addr(dev);
        if (priv->base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 442d236..4c2af21 100644 (file)
@@ -56,7 +56,7 @@ static int msm_pinctrl_probe(struct udevice *dev)
 {
        struct msm_pinctrl_priv *priv = dev_get_priv(dev);
 
-       priv->base = devfdt_get_addr(dev);
+       priv->base = dev_read_addr(dev);
        priv->data = (struct msm_pinctrl_data *)dev->driver_data;
 
        return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
index 017650a..825fe57 100644 (file)
@@ -34,7 +34,7 @@ static int dwc_ahci_ofdata_to_platdata(struct udevice *dev)
        struct dwc_ahci_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       priv->base = map_physmem(devfdt_get_addr(dev), sizeof(void *),
+       priv->base = map_physmem(dev_read_addr(dev), sizeof(void *),
                                 MAP_NOCACHE);
 
        addr = devfdt_get_addr_index(dev, 1);
index 0042958..9927ada 100644 (file)
@@ -553,7 +553,7 @@ static int socfpga_clk_ofdata_to_platdata(struct udevice *dev)
        struct socfpga_clk_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
        plat->regs = (void __iomem *)addr;
index ede0be2..732ed4d 100644 (file)
@@ -285,7 +285,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev)
        socfpga_a10_handoff_workaround(dev);
 
        if (!fdt_node_check_compatible(fdt, offset, "altr,clk-mgr")) {
-               plat->regs = devfdt_get_addr(dev);
+               plat->regs = dev_read_addr(dev);
        } else {
                pdev = dev_get_parent(dev);
                if (!pdev)
index aa86c7c..4a023ea 100644 (file)
@@ -95,7 +95,7 @@ static int exynos7420_clk_topc_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
@@ -149,7 +149,7 @@ static int exynos7420_clk_top0_probe(struct udevice *dev)
        if (!priv)
                return -EINVAL;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index c9ec523..4e25db3 100644 (file)
@@ -253,7 +253,7 @@ static int uniphier_clk_probe(struct udevice *dev)
        struct uniphier_clk_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev->parent);
+       addr = dev_read_addr(dev->parent);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 77c4ba9..13ab967 100644 (file)
@@ -546,7 +546,7 @@ static int ti_edma3_ofdata_to_platdata(struct udevice *dev)
 {
        struct ti_edma3_priv *priv = dev_get_priv(dev);
 
-       priv->base = devfdt_get_addr(dev);
+       priv->base = dev_read_addr(dev);
 
        return 0;
 }
index 324f9c2..75800d9 100644 (file)
@@ -88,7 +88,7 @@ static int altera_pio_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_pio_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct altera_pio_regs),
                                 MAP_NOCACHE);
        plat->gpio_count = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
index 455944d..18f365f 100644 (file)
@@ -299,7 +299,7 @@ static int atmel_pio4_probe(struct udevice *dev)
 
        clk_free(&clk);
 
-       addr_base = devfdt_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index f4b67f1..0dff9ac 100644 (file)
@@ -121,7 +121,7 @@ static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev)
        struct bcm2835_gpio_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index ab0a5cf..f875888 100644 (file)
@@ -545,7 +545,7 @@ static int davinci_gpio_ofdata_to_platdata(struct udevice *dev)
        struct davinci_gpio_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 21a87d6..86804ac 100644 (file)
@@ -112,7 +112,7 @@ static int r7s72100_gpio_probe(struct udevice *dev)
 
        uc_priv->bank_name = dev->name;
        dev = dev_get_parent(dev);
-       addr_base = devfdt_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 30392bc..54a38da 100644 (file)
@@ -142,7 +142,7 @@ static int uniphier_gpio_probe(struct udevice *dev)
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index ac5d20c..fe6b33e 100644 (file)
@@ -96,7 +96,7 @@ static int msm_gpio_probe(struct udevice *dev)
 {
        struct msm_gpio_bank *priv = dev_get_priv(dev);
 
-       priv->base = devfdt_get_addr(dev);
+       priv->base = dev_read_addr(dev);
 
        return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
 }
index 90d36fb..a16f571 100644 (file)
@@ -300,7 +300,7 @@ static int mxc_gpio_ofdata_to_platdata(struct udevice *dev)
        fdt_addr_t addr;
        struct mxc_gpio_plat *plat = dev_get_platdata(dev);
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index cb79726..2c16517 100644 (file)
@@ -275,7 +275,7 @@ static int mxs_ofdata_to_platdata(struct udevice *dev)
        int node = dev_of_offset(dev);
        int ret;
 
-       plat->bank = devfdt_get_addr(dev);
+       plat->bank = dev_read_addr(dev);
        if (plat->bank == FDT_ADDR_T_NONE) {
                printf("%s: No 'reg' property defined!\n", __func__);
                return -EINVAL;
index c986ef0..6eaa0a0 100644 (file)
@@ -308,7 +308,7 @@ static int omap_gpio_bind(struct udevice *dev)
        if (plat)
                return 0;
 
-       base_addr = devfdt_get_addr(dev);
+       base_addr = dev_read_addr(dev);
        if (base_addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
@@ -347,7 +347,7 @@ static int omap_gpio_ofdata_to_platdata(struct udevice *dev)
        struct omap_gpio_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 51df536..58f0446 100644 (file)
@@ -256,7 +256,7 @@ static int pm8941_pwrkey_probe(struct udevice *dev)
        struct pm8916_gpio_bank *priv = dev_get_priv(dev);
        int reg;
 
-       priv->pid = devfdt_get_addr(dev);
+       priv->pid = dev_read_addr(dev);
        if (priv->pid == FDT_ADDR_T_NONE)
                return log_msg_ret("bad address", -EINVAL);
 
index 4a68f44..c78227f 100644 (file)
@@ -339,7 +339,7 @@ static int gpio_exynos_bind(struct udevice *parent)
 
                dev_set_of_offset(dev, node);
 
-               reg = devfdt_get_addr(dev);
+               reg = dev_read_addr(dev);
                if (reg != FDT_ADDR_T_NONE)
                        bank = (struct s5p_gpio_bank *)((ulong)base + reg);
 
index 24da3b3..bf3537b 100644 (file)
@@ -159,7 +159,7 @@ static int sifive_gpio_ofdata_to_platdata(struct udevice *dev)
        struct sifive_gpio_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index d2c1d7d..4efff5c 100644 (file)
@@ -109,7 +109,7 @@ static int vybrid_gpio_odata_to_platdata(struct udevice *dev)
        struct vybrid_gpio_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t base_addr;
 
-       base_addr = devfdt_get_addr(dev);
+       base_addr = dev_read_addr(dev);
        if (base_addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index d8b4a68..a110fe9 100644 (file)
@@ -94,7 +94,7 @@ static int uniphier_fi2c_probe(struct udevice *dev)
        fdt_addr_t addr;
        struct uniphier_fi2c_priv *priv = dev_get_priv(dev);
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index f06523a..e7f44e1 100644 (file)
@@ -50,7 +50,7 @@ static int uniphier_i2c_probe(struct udevice *dev)
        fdt_addr_t addr;
        struct uniphier_i2c_priv *priv = dev_get_priv(dev);
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index b7b2aaf..feeed1e 100644 (file)
@@ -447,7 +447,7 @@ static int imx_lpi2c_probe(struct udevice *bus)
 
        i2c_bus->driver_data = dev_get_driver_data(bus);
 
-       addr = devfdt_get_addr(bus);
+       addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index a846e0a..b7e9ced 100644 (file)
@@ -678,7 +678,7 @@ static int iproc_i2c_ofdata_to_platdata(struct udevice *bus)
        int node = dev_of_offset(bus);
        const void *blob = gd->fdt_blob;
 
-       bus_prvdata->base = map_physmem(devfdt_get_addr(bus),
+       bus_prvdata->base = map_physmem(dev_read_addr(bus),
                                        sizeof(void *),
                                        MAP_NOCACHE);
 
index 3b0d27e..1a1de67 100644 (file)
@@ -899,7 +899,7 @@ static int mxc_i2c_probe(struct udevice *bus)
 
        i2c_bus->driver_data = dev_get_driver_data(bus);
 
-       addr = devfdt_get_addr(bus);
+       addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 8592a81..0af4e33 100644 (file)
@@ -1067,7 +1067,7 @@ static int omap_i2c_ofdata_to_platdata(struct udevice *bus)
 {
        struct omap_i2c_platdata *plat = dev_get_platdata(bus);
 
-       plat->base = devfdt_get_addr(bus);
+       plat->base = dev_read_addr(bus);
        plat->speed = dev_read_u32_default(bus, "clock-frequency",
                                           I2C_SPEED_STANDARD_RATE);
        plat->ip_rev = dev_get_driver_data(bus);
index f82e6d3..e91dac2 100644 (file)
@@ -153,7 +153,7 @@ static int tegra_hsp_probe(struct udevice *dev)
 
        debug("%s(dev=%p)\n", __func__, dev);
 
-       thsp->regs = devfdt_get_addr(dev);
+       thsp->regs = dev_read_addr(dev);
        if (thsp->regs == FDT_ADDR_T_NONE)
                return -ENODEV;
 
index 387c70b..c650265 100644 (file)
@@ -73,7 +73,7 @@ static int altera_sysid_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_sysid_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct altera_sysid_regs),
                                 MAP_NOCACHE);
 
index ee635eb..223aac8 100644 (file)
@@ -187,7 +187,7 @@ static int imx8_scu_probe(struct udevice *dev)
 
        debug("%s(dev=%p) (plat=%p)\n", __func__, dev, plat);
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 44a8b18..64cc4ae 100644 (file)
@@ -26,7 +26,7 @@ static int microchip_flexcom_ofdata_to_platdata(struct udevice *dev)
        struct microchip_flexcom_platdata *plat = dev_get_platdata(dev);
        int ret;
 
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct microchip_flexcom_regs),
                                MAP_NOCACHE);
 
index 5cdf3c5..7a410d1 100644 (file)
@@ -182,7 +182,7 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
        int ret;
        int clock_id = (int)dev_get_driver_data(dev);
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index c4876e8..b793028 100644 (file)
@@ -766,7 +766,7 @@ static int bcm2835_probe(struct udevice *dev)
        upriv->mmc = &plat->mmc;
        plat->cfg.name = dev->name;
 
-       host->phys_addr = devfdt_get_addr(dev);
+       host->phys_addr = dev_read_addr(dev);
        if (host->phys_addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index c14f828..5269aa7 100644 (file)
@@ -62,7 +62,7 @@ static int sdhci_bcmstb_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index d3f1edd..b33f085 100644 (file)
@@ -450,7 +450,7 @@ static int jz_mmc_ofdata_to_platdata(struct udevice *dev)
        struct mmc_config *cfg;
        int ret;
 
-       priv->regs = map_physmem(devfdt_get_addr(dev), 0x100, MAP_NOCACHE);
+       priv->regs = map_physmem(dev_read_addr(dev), 0x100, MAP_NOCACHE);
        cfg = &plat->cfg;
 
        cfg->name = "MSC";
index b7f793c..719dd1e 100644 (file)
@@ -228,7 +228,7 @@ static int meson_mmc_ofdata_to_platdata(struct udevice *dev)
        struct meson_mmc_platdata *pdata = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index db1f851..715eee0 100644 (file)
@@ -1911,7 +1911,7 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
        int node = dev_of_offset(dev);
        int ret;
 
-       plat->base_addr = map_physmem(devfdt_get_addr(dev),
+       plat->base_addr = map_physmem(dev_read_addr(dev),
                                      sizeof(struct hsmmc *),
                                      MAP_NOCACHE);
 
@@ -1933,7 +1933,7 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
                plat->controller_flags |= of_data->controller_flags;
 
 #ifdef CONFIG_OMAP54XX
-       fixups = platform_fixups_mmc(devfdt_get_addr(dev));
+       fixups = platform_fixups_mmc(dev_read_addr(dev));
        if (fixups) {
                plat->hw_rev = fixups->hw_rev;
                cfg->host_caps &= ~fixups->unsupported_caps;
index 7b5010b..cc99beb 100644 (file)
@@ -260,7 +260,7 @@ static int sdhci_cdns_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 2e994d0..ad38690 100644 (file)
@@ -680,7 +680,7 @@ static int sh_mmcif_dm_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 772fe94..315f95c 100644 (file)
@@ -834,7 +834,7 @@ static int sh_sdhi_dm_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 0d6e5d6..879e2c9 100644 (file)
@@ -35,7 +35,7 @@ static int sdhci_tangier_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 20cd237..c653973 100644 (file)
@@ -722,7 +722,7 @@ int tmio_sd_probe(struct udevice *dev, u32 quirks)
        ulong mclk;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 3b5d11f..ccba394 100644 (file)
@@ -1256,7 +1256,7 @@ static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev)
        const char *phy_mode;
        int ret;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        pdata->phy_interface = -1;
 
        /* Decoding of convoluted PHY wiring on Atheros MIPS. */
index 62941bb..1d9eefb 100644 (file)
@@ -1995,9 +1995,9 @@ static int eqos_probe(struct udevice *dev)
        eqos->dev = dev;
        eqos->config = (void *)dev_get_driver_data(dev);
 
-       eqos->regs = devfdt_get_addr(dev);
+       eqos->regs = dev_read_addr(dev);
        if (eqos->regs == FDT_ADDR_T_NONE) {
-               pr_err("devfdt_get_addr() failed");
+               pr_err("dev_read_addr() failed");
                return -ENODEV;
        }
        eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE);
index fd589a0..b9d80a5 100644 (file)
@@ -690,7 +690,7 @@ static int ethoc_ofdata_to_platdata(struct udevice *dev)
        struct ethoc_eth_pdata *pdata = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       pdata->eth_pdata.iobase = devfdt_get_addr(dev);
+       pdata->eth_pdata.iobase = dev_read_addr(dev);
        addr = devfdt_get_addr_index(dev, 1);
        if (addr != FDT_ADDR_T_NONE)
                pdata->packet_base = addr;
index a3f6e3a..bb55be9 100644 (file)
@@ -1534,7 +1534,7 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev)
        struct fec_priv *priv = dev_get_priv(dev);
        const char *phy_mode;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        priv->eth = (struct ethernet_regs *)pdata->iobase;
 
        pdata->phy_interface = -1;
index 4c9a62a..e27f7e5 100644 (file)
@@ -570,7 +570,7 @@ static int mcdmafec_ofdata_to_platdata(struct udevice *dev)
        struct eth_pdata *pdata = dev_get_platdata(dev);
        const u32 *val;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        /* Default to 10Mbit/s */
        pdata->max_speed = 10;
 
index e4d08f2..5676a5b 100644 (file)
@@ -517,7 +517,7 @@ static int ftgmac100_ofdata_to_platdata(struct udevice *dev)
        struct ftgmac100_data *priv = dev_get_priv(dev);
        const char *phy_mode;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        pdata->phy_interface = -1;
        phy_mode = dev_read_string(dev, "phy-mode");
        if (phy_mode)
index 79c64ec..292690d 100644 (file)
@@ -398,7 +398,7 @@ static int ftmac100_ofdata_to_platdata(struct udevice *dev)
        struct ftmac100_data *priv = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
        const char *mac;
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        priv->iobase = pdata->iobase;
        mac = dtbmacaddr(0);
        if (mac)
index 1773c76..d226684 100644 (file)
@@ -642,7 +642,7 @@ static int ks8851_ofdata_to_platdata(struct udevice *dev)
        struct ks_net *ks = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        ks->iobase = pdata->iobase;
 
        return 0;
index d8367b5..f94a2d8 100644 (file)
@@ -589,7 +589,7 @@ static int mcffec_ofdata_to_platdata(struct udevice *dev)
        struct eth_pdata *pdata = dev_get_platdata(dev);
        const u32 *val;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        /* Default to 10Mbit/s */
        pdata->max_speed = 10;
 
index 86f1360..a06a157 100644 (file)
@@ -1418,7 +1418,7 @@ static int mtk_eth_ofdata_to_platdata(struct udevice *dev)
 
        priv->soc = dev_get_driver_data(dev);
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
 
        /* get corresponding ethsys phandle */
        ret = dev_read_phandle_with_args(dev, "mediatek,ethsys", NULL, 0, 0,
index 86b1b8c..2f9464b 100644 (file)
@@ -997,7 +997,7 @@ static int mvgbe_ofdata_to_platdata(struct udevice *dev)
        int pnode;
        unsigned long addr;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        pdata->phy_interface = -1;
 
        pnode = fdt_node_offset_by_compatible(blob, node,
index 092f619..4c7d06c 100644 (file)
@@ -1796,7 +1796,7 @@ static int mvneta_ofdata_to_platdata(struct udevice *dev)
        struct eth_pdata *pdata = dev_get_platdata(dev);
        const char *phy_mode;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
 
        /* Get phy-mode / phy_interface from DT */
        pdata->phy_interface = -1;
index 393ee9b..886f53e 100644 (file)
@@ -651,7 +651,7 @@ int ravb_ofdata_to_platdata(struct udevice *dev)
        const fdt32_t *cell;
        int ret = 0;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        pdata->phy_interface = -1;
        phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
                               NULL);
index 8823769..4cbffb1 100644 (file)
@@ -918,7 +918,7 @@ int sh_ether_ofdata_to_platdata(struct udevice *dev)
        const fdt32_t *cell;
        int ret = 0;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        pdata->phy_interface = -1;
        phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
                               NULL);
index 9c5dc46..09372d7 100644 (file)
@@ -612,7 +612,7 @@ static int smc911x_ofdata_to_platdata(struct udevice *dev)
        struct smc911x_priv *priv = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        priv->iobase = pdata->iobase;
 
        return 0;
index 0784635..0f7ada8 100644 (file)
@@ -746,7 +746,7 @@ static int ave_ofdata_to_platdata(struct udevice *dev)
        if (!priv->data)
                return -EINVAL;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        pdata->phy_interface = -1;
        phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
                               NULL);
index e2b05ac..546cc6c 100644 (file)
@@ -919,7 +919,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
 #endif
        int ret;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        if (pdata->iobase == FDT_ADDR_T_NONE) {
                debug("%s: Cannot find MAC base address\n", __func__);
                return -EINVAL;
index 6364beb..df18ecc 100644 (file)
@@ -594,7 +594,7 @@ static int sunxi_emac_eth_ofdata_to_platdata(struct udevice *dev)
 {
        struct eth_pdata *pdata = dev_get_platdata(dev);
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
 
        return 0;
 }
index e3ac40c..50f0d33 100644 (file)
@@ -787,7 +787,7 @@ static int ks2_eth_ofdata_to_platdata(struct udevice *dev)
 
        ks2_eth_parse_slave_interface(dev_of_offset(dev), gbe_0, priv, pdata);
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
 
        return 0;
 }
index 35176c5..99d4d85 100644 (file)
@@ -722,7 +722,7 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev)
        int offset = 0;
        const char *phy_mode;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        priv->iobase = (struct axi_regs *)pdata->iobase;
 
        offset = fdtdec_lookup_phandle(gd->fdt_blob, node,
index e7f7e6a..64c18ba 100644 (file)
@@ -599,7 +599,7 @@ static int emaclite_ofdata_to_platdata(struct udevice *dev)
        struct xemaclite *emaclite = dev_get_priv(dev);
        int offset = 0;
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        emaclite->regs = (struct emaclite_regs *)ioremap_nocache(pdata->iobase,
                                                                 0x10000);
 
index a0625d7..61e8081 100644 (file)
@@ -111,7 +111,7 @@ static int ar933x_pinctrl_probe(struct udevice *dev)
        struct ar933x_pinctrl_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index c9f9608..2d5a4a3 100644 (file)
@@ -131,7 +131,7 @@ static int qca953x_pinctrl_probe(struct udevice *dev)
        struct qca953x_pinctrl_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index e3ac5a6..4cdc071 100644 (file)
@@ -127,7 +127,7 @@ int exynos_pinctrl_probe(struct udevice *dev)
        if (!priv)
                return -EINVAL;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 801d142..fdb7920 100644 (file)
@@ -158,7 +158,7 @@ static int atmel_pinctrl_probe(struct udevice *dev)
        fdt_addr_t addr_base;
 
        dev = dev_get_parent(dev);
-       addr_base = devfdt_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 5055780..9d7814a 100644 (file)
@@ -112,7 +112,7 @@ static int r7s72100_pfc_probe(struct udevice *dev)
        fdt_addr_t addr_base;
        ofnode node;
 
-       addr_base = devfdt_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 1179afd..340c8c0 100644 (file)
@@ -817,7 +817,7 @@ static int sh_pfc_pinctrl_probe(struct udevice *dev)
        enum sh_pfc_model model = dev_get_driver_data(dev);
        fdt_addr_t base;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 8545b9d..631bb1f 100644 (file)
@@ -422,7 +422,7 @@ int uniphier_pinctrl_probe(struct udevice *dev,
        struct uniphier_pinctrl_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev->parent);
+       addr = dev_read_addr(dev->parent);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 06079d2..fe1bd55 100644 (file)
@@ -247,7 +247,7 @@ static int uniphier_reset_probe(struct udevice *dev)
        struct uniphier_reset_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev->parent);
+       addr = dev_read_addr(dev->parent);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 6f49505..ed057f7 100644 (file)
@@ -172,7 +172,7 @@ static int mv_rtc_ofdata_to_platdata(struct udevice *dev)
 {
        struct mvrtc_pdata *pdata = dev_get_platdata(dev);
 
-       pdata->iobase = devfdt_get_addr(dev);
+       pdata->iobase = dev_read_addr(dev);
        return 0;
 }
 
index 7a86161..35b76f5 100644 (file)
@@ -95,7 +95,7 @@ static int altera_jtaguart_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_jtaguart_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct altera_jtaguart_regs),
                                 MAP_NOCACHE);
 
index f88a293..0be5cd7 100644 (file)
@@ -87,7 +87,7 @@ static int altera_uart_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_uart_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct altera_uart_regs),
                                 MAP_NOCACHE);
        plat->uartclk = dev_read_u32_default(dev, "clock-frequency", 0);
index 71cb31f..f759ea8 100644 (file)
@@ -268,7 +268,7 @@ static int atmel_serial_probe(struct udevice *dev)
 #if CONFIG_IS_ENABLED(OF_CONTROL)
        fdt_addr_t addr_base;
 
-       addr_base = devfdt_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -ENODEV;
 
index 382c3b3..9de94b6 100644 (file)
@@ -150,7 +150,7 @@ static int ar933x_serial_probe(struct udevice *dev)
        fdt_addr_t addr;
        u32 val;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 0102b10..8a4af87 100644 (file)
@@ -171,7 +171,7 @@ static int bcm283x_mu_serial_probe(struct udevice *dev)
         * since we need the soc simple-bus to be probed so that the 'ranges'
         * property is used.
         */
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 0c63c41..95cbe63 100644 (file)
@@ -518,7 +518,7 @@ static int lpuart_serial_ofdata_to_platdata(struct udevice *dev)
        int node = dev_of_offset(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index b599064..402fd53 100644 (file)
@@ -145,7 +145,7 @@ static int coldfire_ofdata_to_platdata(struct udevice *dev)
        struct coldfire_serial_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr_base;
 
-       addr_base = devfdt_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -ENODEV;
 
index 439057b..8cf849f 100644 (file)
@@ -106,7 +106,7 @@ static int meson_serial_ofdata_to_platdata(struct udevice *dev)
        struct meson_serial_platdata *plat = dev->platdata;
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 0cc1aad..a1c9abc 100644 (file)
@@ -219,7 +219,7 @@ static int msm_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct msm_serial_data *priv = dev_get_priv(dev);
 
-       priv->base = devfdt_get_addr(dev);
+       priv->base = dev_read_addr(dev);
        if (priv->base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 42abb96..de6cefc 100644 (file)
@@ -330,7 +330,7 @@ static int mxc_serial_ofdata_to_platdata(struct udevice *dev)
        struct mxc_serial_platdata *plat = dev->platdata;
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 6e5d81c..2772c25 100644 (file)
@@ -354,7 +354,7 @@ int pl01x_serial_ofdata_to_platdata(struct udevice *dev)
        fdt_addr_t addr;
        int ret;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index e3160cf..9bb2be2 100644 (file)
@@ -181,7 +181,7 @@ static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
        struct s5p_serial_platdata *plat = dev->platdata;
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 5f45d58..13b179f 100644 (file)
@@ -211,7 +211,7 @@ static int sh_serial_ofdata_to_platdata(struct udevice *dev)
        fdt_addr_t addr;
        int ret;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (!addr)
                return -EINVAL;
 
index 5fbbfac..33ff396 100644 (file)
@@ -171,7 +171,7 @@ static int sti_asc_serial_probe(struct udevice *dev)
        unsigned long val;
        fdt_addr_t base;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index e77b906..cab0db2 100644 (file)
@@ -221,7 +221,7 @@ static int stm32_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct stm32x7_serial_platdata *plat = dev_get_platdata(dev);
 
-       plat->base = devfdt_get_addr(dev);
+       plat->base = dev_read_addr(dev);
        if (plat->base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index ad691b6..4004cb8 100644 (file)
@@ -115,7 +115,7 @@ static int uniphier_serial_probe(struct udevice *dev)
        fdt_addr_t base;
        u32 tmp;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 3aa7a40..61372c5 100644 (file)
@@ -173,7 +173,7 @@ static int altera_spi_ofdata_to_platdata(struct udevice *bus)
 {
        struct altera_spi_platdata *plat = dev_get_platdata(bus);
 
-       plat->regs = map_physmem(devfdt_get_addr(bus),
+       plat->regs = map_physmem(dev_read_addr(bus),
                                 sizeof(struct altera_spi_regs),
                                 MAP_NOCACHE);
 
index 328b16c..39c6e22 100644 (file)
@@ -378,7 +378,7 @@ static int atcspi200_ofdata_to_platadata(struct udevice *bus)
        const void *blob = gd->fdt_blob;
        int node = dev_of_offset(bus);
 
-       ns->regs = map_physmem(devfdt_get_addr(bus),
+       ns->regs = map_physmem(dev_read_addr(bus),
                                 sizeof(struct atcspi200_spi_regs),
                                 MAP_NOCACHE);
        if (!ns->regs) {
index f64a28c..70bedc7 100644 (file)
@@ -178,7 +178,7 @@ static int ath79_spi_probe(struct udevice *bus)
        struct ath79_spi_priv *priv = dev_get_priv(bus);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(bus);
+       addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index dec92df..8fa6d35 100644 (file)
@@ -392,7 +392,7 @@ static int coldfire_dspi_ofdata_to_platdata(struct udevice *bus)
        int node = dev_of_offset(bus);
        int *ctar, len;
 
-       addr = devfdt_get_addr(bus);
+       addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE)
                return -ENOMEM;
 
index e1e9b45..a11433d 100644 (file)
@@ -396,7 +396,7 @@ static int davinci_ofdata_to_platadata(struct udevice *bus)
        struct davinci_spi_platdata *plat = bus->platdata;
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(bus);
+       addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 78ad61c..9396c38 100644 (file)
@@ -534,7 +534,7 @@ static int fsl_dspi_ofdata_to_platdata(struct udevice *bus)
        plat->num_chipselect =
                fdtdec_get_int(blob, node, "num-cs", FSL_DSPI_MAX_CHIPSELECT);
 
-       addr = devfdt_get_addr(bus);
+       addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE) {
                debug("DSPI: Can't get base address or size\n");
                return -ENOMEM;
index aad3780..e90a06a 100644 (file)
@@ -537,7 +537,7 @@ static int mxc_spi_probe(struct udevice *bus)
                }
        }
 
-       mxcs->base = devfdt_get_addr(bus);
+       mxcs->base = dev_read_addr(bus);
        if (mxcs->base == FDT_ADDR_T_NONE)
                return -ENODEV;
 
index 39e6813..fbf9575 100644 (file)
@@ -488,7 +488,7 @@ static int omap3_spi_probe(struct udevice *dev)
        struct omap2_mcspi_platform_config* data =
                (struct omap2_mcspi_platform_config*)dev_get_driver_data(dev);
 
-       priv->regs = (struct mcspi *)(devfdt_get_addr(dev) + data->regs_offset);
+       priv->regs = (struct mcspi *)(dev_read_addr(dev) + data->regs_offset);
        if (fdtdec_get_bool(blob, node, "ti,pindir-d0-out-d1-in"))
                priv->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
        else
index d2dccd6..cd2e17b 100644 (file)
@@ -519,7 +519,7 @@ static int sun4i_spi_ofdata_to_platdata(struct udevice *bus)
        struct sun4i_spi_platdata *plat = dev_get_platdata(bus);
        int node = dev_of_offset(bus);
 
-       plat->base = devfdt_get_addr(bus);
+       plat->base = dev_read_addr(bus);
        plat->variant = (struct sun4i_spi_variant *)dev_get_driver_data(bus);
        plat->max_hz = fdtdec_get_int(gd->fdt_blob, node,
                                      "spi-max-frequency",
index 22a0304..771744d 100644 (file)
@@ -93,7 +93,7 @@ static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus)
        const void *blob = gd->fdt_blob;
        int node = dev_of_offset(bus);
 
-       plat->base = devfdt_get_addr(bus);
+       plat->base = dev_read_addr(bus);
        plat->periph_id = clock_decode_periph_id(bus);
 
        if (plat->periph_id == PERIPH_ID_NONE) {
index 3679cf0..f9846ee 100644 (file)
@@ -99,7 +99,7 @@ static int tegra30_spi_ofdata_to_platdata(struct udevice *bus)
        const void *blob = gd->fdt_blob;
        int node = dev_of_offset(bus);
 
-       plat->base = devfdt_get_addr(bus);
+       plat->base = dev_read_addr(bus);
        plat->periph_id = clock_decode_periph_id(bus);
 
        if (plat->periph_id == PERIPH_ID_NONE) {
index 0db0de8..5fdbb49 100644 (file)
@@ -461,7 +461,7 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus)
        fdt_addr_t mmap_size;
 
        priv->ctrl_mod_mmap = map_syscon_chipselects(bus);
-       priv->base = map_physmem(devfdt_get_addr(bus),
+       priv->base = map_physmem(dev_read_addr(bus),
                                 sizeof(struct ti_qspi_regs), MAP_NOCACHE);
        mmap_addr = devfdt_get_addr_size_index(bus, 1, &mmap_size);
        priv->memory_map = map_physmem(mmap_addr, mmap_size, MAP_NOCACHE);
index c3a5b3e..a72986b 100644 (file)
@@ -181,10 +181,10 @@ static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus)
 
        debug("%s\n", __func__);
 
-       plat->regs = (struct zynqmp_qspi_regs *)(devfdt_get_addr(bus) +
+       plat->regs = (struct zynqmp_qspi_regs *)(dev_read_addr(bus) +
                                                 GQSPI_REG_OFFSET);
        plat->dma_regs = (struct zynqmp_qspi_dma_regs *)
-                         (devfdt_get_addr(bus) + GQSPI_DMA_REG_OFFSET);
+                         (dev_read_addr(bus) + GQSPI_DMA_REG_OFFSET);
 
        return 0;
 }
index ed93faf..2f430ae 100644 (file)
@@ -156,7 +156,7 @@ static int msm_spmi_probe(struct udevice *dev)
        bool is_v1;
        int i;
 
-       priv->arb_chnl = devfdt_get_addr(dev);
+       priv->arb_chnl = dev_read_addr(dev);
        priv->spmi_core = fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
                        dev_of_offset(parent), node, "reg", 1, NULL, false);
        priv->spmi_obs = fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
index 6e20b4f..c011906 100644 (file)
@@ -92,7 +92,7 @@ static int atftmr_timer_probe(struct udevice *dev)
 static int atftme_timer_ofdata_to_platdata(struct udevice *dev)
 {
        struct atftmr_timer_platdata *plat = dev_get_platdata(dev);
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct atftmr_timer_regs),
                                 MAP_NOCACHE);
        return 0;
index 6ca9501..6cb2923 100644 (file)
@@ -69,7 +69,7 @@ static int altera_timer_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_timer_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = map_physmem(devfdt_get_addr(dev),
+       plat->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct altera_timer_regs),
                                 MAP_NOCACHE);
 
index c5d43b4..5d4ae68 100644 (file)
@@ -89,7 +89,7 @@ static int atcpit_timer_probe(struct udevice *dev)
 static int atcpit_timer_ofdata_to_platdata(struct udevice *dev)
 {
        struct atcpit_timer_platdata *plat = dev_get_platdata(dev);
-       plat->regs = map_physmem(devfdt_get_addr(dev) , 0x100 , MAP_NOCACHE);
+       plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE);
        return 0;
 }
 
index 700c349..cf3d27b 100644 (file)
@@ -79,7 +79,7 @@ static int omap_timer_ofdata_to_platdata(struct udevice *dev)
 {
        struct omap_timer_priv *priv = dev_get_priv(dev);
 
-       priv->regs = map_physmem(devfdt_get_addr(dev),
+       priv->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct omap_gptimer_regs), MAP_NOCACHE);
 
        return 0;
index 88317b1..54b52dc 100644 (file)
@@ -70,7 +70,7 @@ static int uniphier_dwc3_probe(struct udevice *dev)
        int (*init)(void __iomem *regs);
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index f9083d9..3b208e8 100644 (file)
@@ -95,7 +95,7 @@ static int ehci_atmel_probe(struct udevice *dev)
        /*
         * Get the base address for EHCI controller from the device node
         */
-       hcd_base = devfdt_get_addr(dev);
+       hcd_base = dev_read_addr(dev);
        if (hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the EHCI register base address\n");
                return -ENXIO;
index 0b0b213..6a37c5d 100644 (file)
@@ -53,7 +53,7 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
        /*
         * Get the base address for XHCI controller from the device node
         */
-       plat->hcd_base = devfdt_get_addr(dev);
+       plat->hcd_base = dev_read_addr(dev);
        if (plat->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the XHCI register base address\n");
                return -ENXIO;
index ac6c5b5..5423d10 100644 (file)
@@ -105,7 +105,7 @@ static int ehci_fsl_probe(struct udevice *dev)
        /*
         * Get the base address for EHCI controller from the device node
         */
-       priv->hcd_base = devfdt_get_addr(dev);
+       priv->hcd_base = dev_read_addr(dev);
        if (priv->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the EHCI register base address\n");
                return -ENXIO;
index 8fe685a..62414bb 100644 (file)
@@ -109,7 +109,7 @@ static int ehci_mvebu_probe(struct udevice *dev)
        /*
         * Get the base address for EHCI controller from the device node
         */
-       priv->hcd_base = devfdt_get_addr(dev);
+       priv->hcd_base = dev_read_addr(dev);
        if (priv->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the EHCI register base address\n");
                return -ENXIO;
index 1705acc..6fb7a7f 100644 (file)
@@ -62,7 +62,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
        /*
         * Get the base address for XHCI controller from the device node
         */
-       plat->hcd_base = devfdt_get_addr(dev);
+       plat->hcd_base = dev_read_addr(dev);
        if (plat->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the XHCI register base address\n");
                return -ENXIO;
index d8fb2c5..0a2da70 100644 (file)
@@ -120,7 +120,7 @@ static int xhci_fsl_probe(struct udevice *dev)
        /*
         * Get the base address for XHCI controller from the device node
         */
-       priv->hcd_base = devfdt_get_addr(dev);
+       priv->hcd_base = dev_read_addr(dev);
        if (priv->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the XHCI register base address\n");
                return -ENXIO;
index 5fb7484..f2e338f 100644 (file)
@@ -72,7 +72,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
        /*
         * Get the base address for XHCI controller from the device node
         */
-       plat->hcd_base = devfdt_get_addr(dev);
+       plat->hcd_base = dev_read_addr(dev);
        if (plat->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the XHCI register base address\n");
                return -ENXIO;
index 4964697..8fc51df 100644 (file)
@@ -136,7 +136,7 @@ static int xhci_rcar_ofdata_to_platdata(struct udevice *dev)
 {
        struct rcar_xhci_platdata *plat = dev_get_platdata(dev);
 
-       plat->hcd_base = devfdt_get_addr(dev);
+       plat->hcd_base = dev_read_addr(dev);
        if (plat->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the XHCI register base address\n");
                return -ENXIO;
index 749bde8..999ee1c 100644 (file)
@@ -884,7 +884,7 @@ static int exynos_dp_ofdata_to_platdata(struct udevice *dev)
        unsigned int node = dev_of_offset(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE) {
                debug("Can't get the DP base address\n");
                return -EINVAL;
index d5b13a6..979b909 100644 (file)
@@ -486,7 +486,7 @@ int exynos_fb_ofdata_to_platdata(struct udevice *dev)
        const void *blob = gd->fdt_blob;
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE) {
                debug("Can't get the FIMD base address\n");
                return -EINVAL;
index 5bf0865..8e6372f 100644 (file)
@@ -171,7 +171,7 @@ static int mxc_w1_ofdata_to_platdata(struct udevice *dev)
        struct mxc_w1_pdata *pdata = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
index 2d8bfc0..f673fce 100644 (file)
@@ -92,7 +92,7 @@ static int stm32mp_wdt_probe(struct udevice *dev)
 
        debug("IWDG init\n");
 
-       priv->base = devfdt_get_addr(dev);
+       priv->base = dev_read_addr(dev);
        if (priv->base == FDT_ADDR_T_NONE)
                return -EINVAL;