drivers: use dev_read_addr_ptr when cast to pointer

The fdt_addr_t and phys_addr_t size have been decoupled. A 32bit CPU
can expect 64-bit data from the device tree parser, so use
dev_read_addr_ptr instead of the dev_read_addr function in the
various files in the drivers directory that cast to a pointer.
As we are there also streamline the error response to -EINVAL on return.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index e90aff0..7cdde11 100644 (file)
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -71,8 +71,8 @@ static int mvebu_reset_of_to_plat(struct udevice *dev)
 {
        struct mvebu_reset_data *data = dev_get_priv(dev);
 
-       data->base = (void *)dev_read_addr(dev);
-       if ((fdt_addr_t)data->base == FDT_ADDR_T_NONE)
+       data->base = dev_read_addr_ptr(dev);
+       if (!data->base)
                return -EINVAL;
 
        return 0;

diff --git a/doc/develop/driver-model/livetree.rst b/doc/develop/driver-model/livetree.rst
index 579eef5..20055d5 100644 (file)
--- a/doc/develop/driver-model/livetree.rst
+++ b/doc/develop/driver-model/livetree.rst
@@ -103,7 +103,7 @@ The new code is:
 
     struct udevice *bus;
 
-    i2c_bus->regs = (struct i2c_ctlr *)dev_read_addr(dev);
+    i2c_bus->regs = dev_read_addr_ptr(dev);
     plat->frequency = dev_read_u32_default(bus, "spi-max-frequency", 500000);
 
 The dev_read\_...() interface is more convenient and works with both the

diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 167b5a3..6a4d861 100644 (file)
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -912,7 +912,7 @@ int dwc_ahsata_probe(struct udevice *dev)
 #endif
        uc_priv->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                        ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NO_ATAPI;
-       uc_priv->mmio_base = (void __iomem *)dev_read_addr(dev);
+       uc_priv->mmio_base = dev_read_addr_ptr(dev);
 
        /* initialize adapter */
        ret = ahci_host_init(uc_priv);

diff --git a/drivers/cache/cache-l2x0.c b/drivers/cache/cache-l2x0.c
index a1556fb..560f4c9 100644 (file)
--- a/drivers/cache/cache-l2x0.c
+++ b/drivers/cache/cache-l2x0.c
@@ -13,7 +13,7 @@ static void l2c310_of_parse_and_init(struct udevice *dev)
 {
        u32 tag[3] = { 0, 0, 0 };
        u32 saved_reg, prefetch;
-       struct pl310_regs *regs = (struct pl310_regs *)dev_read_addr(dev);
+       struct pl310_regs *regs = dev_read_addr_ptr(dev);
 
        /* Disable the L2 Cache */
        clrbits_le32(&regs->pl310_ctrl, L2X0_CTRL_EN);

diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index eda07d3..fe3f939 100644 (file)
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -119,7 +119,7 @@ static int v5l2_of_to_plat(struct udevice *dev)
        struct v5l2_plat *plat = dev_get_plat(dev);
        struct l2cache *regs;
 
-       regs = (struct l2cache *)(uintptr_t)dev_read_addr(dev);
+       regs = dev_read_addr_ptr(dev);
        plat->regs = regs;
 
        plat->iprefetch = -EINVAL;

diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 1cbcc43..c97e440 100644 (file)
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -232,7 +232,7 @@ static int mscc_sgpio_probe(struct udevice *dev)
        debug("probe: gpios = %d, bit-count = %d\n",
              uc_priv->gpio_count, priv->bitcount);
 
-       priv->regs = (u32 __iomem *)dev_read_addr(dev);
+       priv->regs = dev_read_addr_ptr(dev);
        uc_priv->bank_name = "sgpio";
 
        sgpio_clrsetbits(priv, REG_SIO_CONFIG, 0,

diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 4291e49..55105f2 100644 (file)
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -339,8 +339,8 @@ static int gpio_tegra_bind(struct udevice *parent)
        if (len < 0)
                return len;
        bank_count = len / 3 / sizeof(u32);
-       ctlr = (struct gpio_ctlr *)dev_read_addr(parent);
-       if ((ulong)ctlr == FDT_ADDR_T_NONE)
+       ctlr = dev_read_addr_ptr(parent);
+       if (!ctlr)
                return -EINVAL;
        }
 #endif

diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 510838d..fa8d630 100644 (file)
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -268,7 +268,7 @@ static int xilinx_gpio_of_to_plat(struct udevice *dev)
        struct xilinx_gpio_plat *plat = dev_get_plat(dev);
        int is_dual;
 
-       plat->regs = (struct gpio_regs *)dev_read_addr(dev);
+       plat->regs = dev_read_addr_ptr(dev);
 
        plat->bank_max[0] = dev_read_u32_default(dev, "xlnx,gpio-width", 0);
        plat->bank_input[0] = dev_read_u32_default(dev, "xlnx,all-inputs", 0);

diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index c1672ca..1a89207 100644 (file)
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -479,9 +479,9 @@ static int cdns_i2c_of_to_plat(struct udevice *dev)
        struct clk clk;
        int ret;
 
-       i2c_bus->regs = (struct cdns_i2c_regs *)dev_read_addr(dev);
+       i2c_bus->regs = dev_read_addr_ptr(dev);
        if (!i2c_bus->regs)
-               return -ENOMEM;
+               return -EINVAL;
 
        if (pdata)
                i2c_bus->quirks = pdata->quirks;

diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 2394e9d..5864a1a 100644 (file)
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -364,8 +364,8 @@ static int tegra_i2c_probe(struct udevice *dev)
 
        i2c_bus->id = dev_seq(dev);
        i2c_bus->type = dev_get_driver_data(dev);
-       i2c_bus->regs = (struct i2c_ctlr *)dev_read_addr(dev);
-       if ((ulong)i2c_bus->regs == FDT_ADDR_T_NONE) {
+       i2c_bus->regs = dev_read_addr_ptr(dev);
+       if (!i2c_bus->regs) {
                debug("%s: Cannot get regs address\n", __func__);
                return -EINVAL;
        }

diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 42a6134..fd667ae 100644 (file)
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -584,7 +584,7 @@ static int am654_sdhci_of_to_plat(struct udevice *dev)
        int ret;
 
        host->name = dev->name;
-       host->ioaddr = (void *)dev_read_addr(dev);
+       host->ioaddr = dev_read_addr_ptr(dev);
        plat->non_removable = dev_read_bool(dev, "non-removable");
 
        if (plat->flags & DLL_PRESENT) {

diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 05ca361..3a3d23a 100644 (file)
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -506,7 +506,7 @@ static int davinci_mmc_of_to_plat(struct udevice *dev)
        struct davinci_mmc_plat *plat = dev_get_plat(dev);
        struct mmc_config *cfg = &plat->cfg;
 
-       plat->reg_base = (struct davinci_mmc_regs *)dev_read_addr(dev);
+       plat->reg_base = dev_read_addr_ptr(dev);
        cfg->f_min = 200000;
        cfg->f_max = 25000000;
        cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34,

diff --git a/drivers/mmc/piton_mmc.c b/drivers/mmc/piton_mmc.c
index 9f5da6d..a330bbf 100644 (file)
--- a/drivers/mmc/piton_mmc.c
+++ b/drivers/mmc/piton_mmc.c
@@ -74,7 +74,7 @@ static int piton_mmc_ofdata_to_platdata(struct udevice *dev)
        struct mmc *mmc;
        struct blk_desc *bdesc;
 
-       priv->base_addr = (void *)dev_read_addr(dev);
+       priv->base_addr = dev_read_addr_ptr(dev);
        cfg = &plat->cfg;
        cfg->name = "PITON MMC";
        cfg->host_caps = MMC_MODE_8BIT;

diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index 760eca4..f76fee3 100644 (file)
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -708,7 +708,7 @@ static int tegra_mmc_probe(struct udevice *dev)
 
        cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 
-       priv->reg = (void *)dev_read_addr(dev);
+       priv->reg = dev_read_addr_ptr(dev);
 
        ret = reset_get_by_name(dev, "sdhci", &priv->reset_ctl);
        if (ret) {

diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 9dc3106..e44868a 100644 (file)
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -1196,9 +1196,9 @@ static int arasan_sdhci_of_to_plat(struct udevice *dev)
        arasan_dt_parse_clk_phases(dev);
 #endif
 
-       priv->host->ioaddr = (void *)dev_read_addr(dev);
-       if (IS_ERR(priv->host->ioaddr))
-               return PTR_ERR(priv->host->ioaddr);
+       priv->host->ioaddr = dev_read_addr_ptr(dev);
+       if (!priv->host->ioaddr)
+               return -EINVAL;
 
        priv->bank = dev_read_u32_default(dev, "xlnx,mio-bank", 0);
        priv->no_1p8 = dev_read_bool(dev, "no-1-8-v");

diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 99e2681..5879412 100644 (file)
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -1233,7 +1233,7 @@ static int arasan_probe(struct udevice *dev)
        ofnode child;
        int err = -1;
 
-       info->reg = (struct nand_regs *)dev_read_addr(dev);
+       info->reg = dev_read_addr_ptr(dev);
        mtd = nand_to_mtd(nand_chip);
        nand_set_controller_data(nand_chip, &arasan->nand_ctrl);
 

diff --git a/drivers/mtd/nand/raw/cortina_nand.c b/drivers/mtd/nand/raw/cortina_nand.c
index 8de3573..b7be660 100644 (file)
--- a/drivers/mtd/nand/raw/cortina_nand.c
+++ b/drivers/mtd/nand/raw/cortina_nand.c
@@ -1174,7 +1174,7 @@ static int fdt_decode_nand(struct udevice *dev, struct nand_drv *info)
 {
        int ecc_strength;
 
-       info->reg = (struct nand_ctlr *)dev_read_addr(dev);
+       info->reg = dev_read_addr_ptr(dev);
        info->dma_glb = dev_read_addr_index_ptr(dev, 1);
        info->dma_nand = dev_read_addr_index_ptr(dev, 2);
        info->config.enabled = dev_read_enabled(dev);

diff --git a/drivers/mtd/nand/raw/mxic_nand.c b/drivers/mtd/nand/raw/mxic_nand.c
index e54df46..6abdc24 100644 (file)
--- a/drivers/mtd/nand/raw/mxic_nand.c
+++ b/drivers/mtd/nand/raw/mxic_nand.c
@@ -538,7 +538,7 @@ static int mxic_nfc_probe(struct udevice *dev)
        ofnode child;
        int err;
 
-       nfc->regs = (void *)dev_read_addr(dev);
+       nfc->regs = dev_read_addr_ptr(dev);
 
        nfc->send_clk = devm_clk_get(dev, "send");
        if (IS_ERR(nfc->send_clk))

diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index d2801d4..139d978 100644 (file)
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -906,7 +906,7 @@ static int fdt_decode_nand(struct udevice *dev, struct fdt_nand *config)
 {
        int err;
 
-       config->reg = (struct nand_ctlr *)dev_read_addr(dev);
+       config->reg = dev_read_addr_ptr(dev);
        config->enabled = dev_read_enabled(dev);
        config->width = dev_read_u32_default(dev, "nvidia,nand-width", 8);
        err = gpio_request_by_name(dev, "nvidia,wp-gpios", 0, &config->wp_gpio,

diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 14cb2ba..9e3ee74 100644 (file)
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1085,7 +1085,7 @@ static int zynq_nand_probe(struct udevice *dev)
        int ondie_ecc_enabled = 0;
        int is_16bit_bw;
 
-       smc->reg = (struct zynq_nand_smc_regs *)dev_read_addr(dev);
+       smc->reg = dev_read_addr_ptr(dev);
        of_nand = dev_read_subnode(dev, "nand-controller@0,0");
        if (!ofnode_valid(of_nand)) {
                of_nand = dev_read_subnode(dev, "flash@e1000000");

diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index 6fb8a98..c0ebcdb 100644 (file)
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -208,7 +208,7 @@ static int mvmdio_probe(struct udevice *dev)
 {
        struct mvmdio_priv *priv = dev_get_priv(dev);
 
-       priv->mdio_base = (void *)dev_read_addr(dev);
+       priv->mdio_base = dev_read_addr_ptr(dev);
        priv->type = (enum mvmdio_bus_type)dev_get_driver_data(dev);
 
        return 0;

diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c
index 038b810..a0bcc8d 100644 (file)
--- a/drivers/net/qe/dm_qe_uec_phy.c
+++ b/drivers/net/qe/dm_qe_uec_phy.c
@@ -97,7 +97,7 @@ static int qe_uec_mdio_probe(struct udevice *dev)
        u32 num = 0;
        int ret = -ENODEV;
 
-       priv->base = (struct ucc_mii_mng *)dev_read_addr(dev);
+       priv->base = dev_read_addr_ptr(dev);
        base = (fdt_size_t)priv->base;
 
        /*

diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index b0fc9ca..af0e55c 100644 (file)
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -983,8 +983,8 @@ static int pcie_advk_of_to_plat(struct udevice *dev)
        struct pcie_advk *pcie = dev_get_priv(dev);
 
        /* Get the register base address */
-       pcie->base = (void *)dev_read_addr(dev);
-       if ((fdt_addr_t)pcie->base == FDT_ADDR_T_NONE)
+       pcie->base = dev_read_addr_ptr(dev);
+       if (!pcie->base)
                return -EINVAL;
 
        return 0;

diff --git a/drivers/phy/allwinner/phy-sun50i-usb3.c b/drivers/phy/allwinner/phy-sun50i-usb3.c
index e5a3d2d..609d9d4 100644 (file)
--- a/drivers/phy/allwinner/phy-sun50i-usb3.c
+++ b/drivers/phy/allwinner/phy-sun50i-usb3.c
@@ -149,9 +149,9 @@ static int sun50i_usb3_phy_probe(struct udevice *dev)
                return ret;
        }
 
-       priv->regs = (void __iomem *)dev_read_addr(dev);
-       if (IS_ERR(priv->regs))
-               return PTR_ERR(priv->regs);
+       priv->regs = dev_read_addr_ptr(dev);
+       if (!priv->regs)
+               return -EINVAL;
 
        return 0;
 }

diff --git a/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c b/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c
index 14c3d83..05a9a2c 100644 (file)
--- a/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c
+++ b/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c
@@ -184,8 +184,8 @@ static int hsphy_probe(struct udevice *dev)
        struct hsphy_priv *priv = dev_get_priv(dev);
        int ret;
 
-       priv->base = (void *)dev_read_addr(dev);
-       if ((ulong)priv->base == FDT_ADDR_T_NONE)
+       priv->base = dev_read_addr_ptr(dev);
+       if (!priv->base)
                return -EINVAL;
 
        ret = reset_get_by_name(dev, "phy", &priv->phy_rst);

diff --git a/drivers/phy/qcom/phy-qcom-usb-ss.c b/drivers/phy/qcom/phy-qcom-usb-ss.c
index 4e81687..1b03a3c 100644 (file)
--- a/drivers/phy/qcom/phy-qcom-usb-ss.c
+++ b/drivers/phy/qcom/phy-qcom-usb-ss.c
@@ -115,8 +115,8 @@ static int ssphy_probe(struct udevice *dev)
        struct ssphy_priv *priv = dev_get_priv(dev);
        int ret;
 
-       priv->base = (void *)dev_read_addr(dev);
-       if ((ulong)priv->base == FDT_ADDR_T_NONE)
+       priv->base = dev_read_addr_ptr(dev);
+       if (!priv->base)
                return -EINVAL;
 
        ret = ssphy_clk_init(dev, priv);

diff --git a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
index 5ae41fb..66c75f9 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
+++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
@@ -93,8 +93,8 @@ static int rockchip_p3phy_probe(struct udevice *dev)
        struct udevice *syscon;
        int ret;
 
-       priv->mmio = (void __iomem *)dev_read_addr(dev);
-       if ((fdt_addr_t)priv->mmio == FDT_ADDR_T_NONE)
+       priv->mmio = dev_read_addr_ptr(dev);
+       if (!priv->mmio)
                return -EINVAL;
 
        ret = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,

diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index ca63b85..47c69dd 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -674,9 +674,9 @@ static int rockchip_tcphy_probe(struct udevice *dev)
        unsigned int reg;
        int index, ret;
 
-       priv->reg_base = (void __iomem *)dev_read_addr(dev);
-       if (IS_ERR(priv->reg_base))
-               return PTR_ERR(priv->reg_base);
+       priv->reg_base = dev_read_addr_ptr(dev);
+       if (!priv->reg_base)
+               return -EINVAL;
 
        ret = dev_read_u32_index(dev, "reg", 1, &reg);
        if (ret) {

diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 95fc264..8703470 100644 (file)
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -59,7 +59,7 @@ static int tegra_pwm_of_to_plat(struct udevice *dev)
 {
        struct tegra_pwm_priv *priv = dev_get_priv(dev);
 
-       priv->regs = (struct pwm_ctlr *)dev_read_addr(dev);
+       priv->regs = dev_read_addr_ptr(dev);
 
        return 0;
 }

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 9bb9b7d..1847d1f 100644 (file)
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -259,9 +259,9 @@ static int zynq_serial_of_to_plat(struct udevice *dev)
 {
        struct zynq_uart_plat *plat = dev_get_plat(dev);
 
-       plat->regs = (struct uart_zynq *)dev_read_addr(dev);
-       if (IS_ERR(plat->regs))
-               return PTR_ERR(plat->regs);
+       plat->regs = dev_read_addr_ptr(dev);
+       if (!plat->regs)
+               return -EINVAL;
 
        return 0;
 }

diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 7889217..7d15390 100644 (file)
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -56,7 +56,7 @@ static int mpc8xxx_spi_of_to_plat(struct udevice *dev)
        struct clk clk;
        int ret;
 
-       priv->spi = (spi8xxx_t *)dev_read_addr(dev);
+       priv->spi = dev_read_addr_ptr(dev);
 
        ret = gpio_request_list_by_name(dev, "gpios", priv->gpios,
                                        ARRAY_SIZE(priv->gpios), GPIOD_IS_OUT | GPIOD_ACTIVE_LOW);

diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index 2a01ea0..95bea0d 100644 (file)
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -217,7 +217,7 @@ static int mscc_bb_spi_probe(struct udevice *bus)
 
        debug("%s: loaded, priv %p\n", __func__, priv);
 
-       priv->regs = (void __iomem *)dev_read_addr(bus);
+       priv->regs = dev_read_addr_ptr(bus);
 
        priv->deactivate_delay_us =
                dev_read_u32_default(bus, "spi-deactivate-delay", 0);

diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index 861423b..7dd1fe7 100644 (file)
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -334,7 +334,7 @@ static int sh_qspi_of_to_plat(struct udevice *dev)
 {
        struct sh_qspi_slave *plat = dev_get_plat(dev);
 
-       plat->regs = (struct sh_qspi_regs *)dev_read_addr(dev);
+       plat->regs = dev_read_addr_ptr(dev);
 
        return 0;
 }

diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c
index 6aae9f7..f663b9d 100644 (file)
--- a/drivers/spi/spi-mxic.c
+++ b/drivers/spi/spi-mxic.c
@@ -508,7 +508,7 @@ static int mxic_spi_probe(struct udevice *bus)
 {
        struct mxic_spi_priv *priv = dev_get_priv(bus);
 
-       priv->regs = (void *)dev_read_addr(bus);
+       priv->regs = dev_read_addr_ptr(bus);
 
        priv->send_clk = devm_clk_get(bus, "send_clk");
        if (IS_ERR(priv->send_clk))

diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 9e6255a..33575fe 100644 (file)
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -114,7 +114,7 @@ static int xilinx_spi_probe(struct udevice *bus)
        struct xilinx_spi_priv *priv = dev_get_priv(bus);
        struct xilinx_spi_regs *regs;
 
-       regs = priv->regs = (struct xilinx_spi_regs *)dev_read_addr(bus);
+       regs = priv->regs = dev_read_addr_ptr(bus);
        priv->fifo_depth = dev_read_u32_default(bus, "fifo-size", 0);
 
        writel(SPISSR_RESET_VALUE, &regs->srr);

diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 13e730b..8dd29ed 100644 (file)
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -1880,7 +1880,7 @@ int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops)
 
        hba->dev = ufs_dev;
        hba->ops = hba_ops;
-       hba->mmio_base = (void *)dev_read_addr(ufs_dev);
+       hba->mmio_base = dev_read_addr_ptr(ufs_dev);
 
        /* Set descriptor lengths to specification defaults */
        ufshcd_def_desc_sizes(hba);

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 76562bd..2cf1625 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -723,7 +723,7 @@ static int fdt_decode_usb(struct udevice *dev, struct fdt_usb *config)
 {
        const char *phy, *mode;
 
-       config->reg = (struct usb_ctlr *)dev_read_addr(dev);
+       config->reg = dev_read_addr_ptr(dev);
        debug("reg=%p\n", config->reg);
        mode = dev_read_string(dev, "dr_mode");
        if (mode) {

diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index a460692..92e388a 100644 (file)
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -800,8 +800,8 @@ static int dw_mipi_dsi_init(struct udevice *dev,
        dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
        device->host = &dsi->dsi_host;
 
-       dsi->base = (void *)dev_read_addr(device->dev);
-       if ((fdt_addr_t)dsi->base == FDT_ADDR_T_NONE) {
+       dsi->base = dev_read_addr_ptr(device->dev);
+       if (!dsi->base) {
                dev_err(device->dev, "dsi dt register address error\n");
                return -EINVAL;
        }

diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index e21ac7e..dab9902 100644 (file)
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -447,7 +447,7 @@ int rk_vop_probe(struct udevice *dev)
        efi_add_memory_map(plat->base, plat->size, EFI_RESERVED_MEMORY_TYPE);
 #endif
 
-       priv->regs = (struct rk3288_vop *)dev_read_addr(dev);
+       priv->regs = dev_read_addr_ptr(dev);
 
        /*
         * Try all the ports until we find one that works. In practice this

diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index e6347bb..a7420fb 100644 (file)
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -427,8 +427,8 @@ static int stm32_dsi_probe(struct udevice *dev)
 
        device->dev = dev;
 
-       priv->base = (void *)dev_read_addr(dev);
-       if ((fdt_addr_t)priv->base == FDT_ADDR_T_NONE) {
+       priv->base = dev_read_addr_ptr(dev);
+       if (!priv->base) {
                dev_err(dev, "dsi dt register address error\n");
                return -EINVAL;
        }

diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 58b6434..f48badc 100644 (file)
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -507,8 +507,8 @@ static int stm32_ltdc_probe(struct udevice *dev)
        ulong rate;
        int ret;
 
-       priv->regs = (void *)dev_read_addr(dev);
-       if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) {
+       priv->regs = dev_read_addr_ptr(dev);
+       if (!priv->regs) {
                dev_err(dev, "ltdc dt register address error\n");
                return -EINVAL;
        }

diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 78ab3f9..9261cc9 100644 (file)
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -361,7 +361,7 @@ static int display_init(struct udevice *dev, void *lcdbase,
                return ret;
        }
 
-       dc_ctlr = (struct dc_ctlr *)dev_read_addr(dev);
+       dc_ctlr = dev_read_addr_ptr(dev);
        if (ofnode_decode_display_timing(dev_ofnode(dev), 0, timing)) {
                debug("%s: Failed to decode display timing\n", __func__);
                return -EINVAL;

diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index ef1a2e6..f291db3 100644 (file)
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -765,7 +765,7 @@ int tegra_dc_sor_attach(struct udevice *dc_dev, struct udevice *dev,
 
        /* Use the first display controller */
        debug("%s\n", __func__);
-       disp_ctrl = (struct dc_ctlr *)dev_read_addr(dc_dev);
+       disp_ctrl = dev_read_addr_ptr(dc_dev);
 
        tegra_dc_sor_enable_dc(disp_ctrl);
        tegra_dc_sor_config_panel(sor, 0, link_cfg, timing);
@@ -978,7 +978,7 @@ int tegra_dc_sor_detach(struct udevice *dc_dev, struct udevice *dev)
 
        debug("%s\n", __func__);
        /* Use the first display controller */
-       disp_ctrl = (struct dc_ctlr *)dev_read_addr(dev);
+       disp_ctrl = dev_read_addr_ptr(dev);
 
        /* Sleep mode */
        tegra_sor_writel(sor, SUPER_STATE1, SUPER_STATE1_ASY_HEAD_OP_SLEEP |
@@ -1047,7 +1047,7 @@ static int tegra_sor_of_to_plat(struct udevice *dev)
        struct tegra_dc_sor_data *priv = dev_get_priv(dev);
        int ret;
 
-       priv->base = (void *)dev_read_addr(dev);
+       priv->base = dev_read_addr_ptr(dev);
 
        priv->pmc_base = (void *)syscon_get_first_range(TEGRA_SYSCON_PMC);
        if (IS_ERR(priv->pmc_base))

diff --git a/drivers/video/ti/tilcdc.c b/drivers/video/ti/tilcdc.c
index 88043fc..2734754 100644 (file)
--- a/drivers/video/ti/tilcdc.c
+++ b/drivers/video/ti/tilcdc.c
@@ -387,8 +387,8 @@ static int tilcdc_of_to_plat(struct udevice *dev)
 {
        struct tilcdc_priv *priv = dev_get_priv(dev);
 
-       priv->regs = (struct tilcdc_regs *)dev_read_addr(dev);
-       if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) {
+       priv->regs = dev_read_addr_ptr(dev);
+       if (!priv->regs) {
                dev_err(dev, "failed to get base address\n");
                return -EINVAL;
        }

diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index 6dfdd31..743ab64 100644 (file)
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -271,9 +271,9 @@ static int cdns_wdt_of_to_plat(struct udevice *dev)
 {
        struct cdns_wdt_priv *priv = dev_get_priv(dev);
 
-       priv->regs = (struct cdns_regs *)dev_read_addr(dev);
-       if (IS_ERR(priv->regs))
-               return PTR_ERR(priv->regs);
+       priv->regs = dev_read_addr_ptr(dev);
+       if (!priv->regs)
+               return -EINVAL;
 
        priv->rst = dev_read_bool(dev, "reset-on-timeout");
 

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 0d6fb12..6d58fd3 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -116,9 +116,9 @@ static int sp805_wdt_of_to_plat(struct udevice *dev)
        struct sp805_wdt_priv *priv = dev_get_priv(dev);
        struct clk clk;
 
-       priv->reg = (void __iomem *)dev_read_addr(dev);
-       if (IS_ERR(priv->reg))
-               return PTR_ERR(priv->reg);
+       priv->reg = dev_read_addr_ptr(dev);
+       if (!priv->reg)
+               return -EINVAL;
 
        if (!clk_get_by_index(dev, 0, &clk))
                priv->clk_rate = clk_get_rate(&clk);

diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index 1687a45..0f9fb02 100644 (file)
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -94,9 +94,9 @@ static int xlnx_wdt_of_to_plat(struct udevice *dev)
 {
        struct xlnx_wdt_plat *plat = dev_get_plat(dev);
 
-       plat->regs = (struct watchdog_regs *)dev_read_addr(dev);
-       if (IS_ERR(plat->regs))
-               return PTR_ERR(plat->regs);
+       plat->regs = dev_read_addr_ptr(dev);
+       if (!plat->regs)
+               return -EINVAL;
 
        plat->enable_once = dev_read_u32_default(dev, "xlnx,wdt-enable-once",
                                                 0);