Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit5d3a21df66, reversing changes made to56d37f1c56. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -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(dev_read_addr(dev),
|
||||
plat->regs = map_physmem(devfdt_get_addr(dev),
|
||||
sizeof(struct altera_pio_regs),
|
||||
MAP_NOCACHE);
|
||||
plat->gpio_count = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
|
||||
|
||||
@@ -299,7 +299,7 @@ static int atmel_pio4_probe(struct udevice *dev)
|
||||
|
||||
clk_free(&clk);
|
||||
|
||||
addr_base = dev_read_addr(dev);
|
||||
addr_base = devfdt_get_addr(dev);
|
||||
if (addr_base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ static int rcar_gpio_probe(struct udevice *dev)
|
||||
int node = dev_of_offset(dev);
|
||||
int ret;
|
||||
|
||||
priv->regs = dev_read_addr_ptr(dev);
|
||||
priv->regs = (void __iomem *)devfdt_get_addr(dev);
|
||||
uc_priv->bank_name = dev->name;
|
||||
|
||||
ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, node, "gpio-ranges",
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
addr_base = devfdt_get_addr(dev);
|
||||
if (addr_base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ static int msm_gpio_probe(struct udevice *dev)
|
||||
{
|
||||
struct msm_gpio_bank *priv = dev_get_priv(dev);
|
||||
|
||||
priv->base = dev_read_addr(dev);
|
||||
priv->base = devfdt_get_addr(dev);
|
||||
|
||||
return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ static int mvebu_gpio_probe(struct udevice *dev)
|
||||
struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
|
||||
struct mvebu_gpio_priv *priv = dev_get_priv(dev);
|
||||
|
||||
priv->regs = dev_read_addr_ptr(dev);
|
||||
priv->regs = (struct mvebu_gpio_regs *)devfdt_get_addr(dev);
|
||||
uc_priv->gpio_count = MVEBU_GPIOS_PER_BANK;
|
||||
priv->name[0] = 'A' + dev->req_seq;
|
||||
uc_priv->bank_name = priv->name;
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -275,7 +275,7 @@ static int mxs_ofdata_to_platdata(struct udevice *dev)
|
||||
int node = dev_of_offset(dev);
|
||||
int ret;
|
||||
|
||||
plat->bank = dev_read_addr(dev);
|
||||
plat->bank = devfdt_get_addr(dev);
|
||||
if (plat->bank == FDT_ADDR_T_NONE) {
|
||||
printf("%s: No 'reg' property defined!\n", __func__);
|
||||
return -EINVAL;
|
||||
|
||||
@@ -308,7 +308,7 @@ static int omap_gpio_bind(struct udevice *dev)
|
||||
if (plat)
|
||||
return 0;
|
||||
|
||||
base_addr = dev_read_addr(dev);
|
||||
base_addr = devfdt_get_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 = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
priv->pid = devfdt_get_addr(dev);
|
||||
if (priv->pid == FDT_ADDR_T_NONE)
|
||||
return log_msg_ret("bad address", -EINVAL);
|
||||
|
||||
|
||||
@@ -316,7 +316,7 @@ static int gpio_exynos_bind(struct udevice *parent)
|
||||
if (plat)
|
||||
return 0;
|
||||
|
||||
base = dev_read_addr_ptr(parent);
|
||||
base = (struct s5p_gpio_bank *)devfdt_get_addr(parent);
|
||||
for (node = fdt_first_subnode(blob, dev_of_offset(parent)), bank = base;
|
||||
node > 0;
|
||||
node = fdt_next_subnode(blob, node), bank++) {
|
||||
@@ -339,7 +339,7 @@ static int gpio_exynos_bind(struct udevice *parent)
|
||||
|
||||
dev_set_of_offset(dev, node);
|
||||
|
||||
reg = dev_read_addr(dev);
|
||||
reg = devfdt_get_addr(dev);
|
||||
if (reg != FDT_ADDR_T_NONE)
|
||||
bank = (struct s5p_gpio_bank *)((ulong)base + reg);
|
||||
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -293,7 +293,7 @@ static int gpio_sunxi_bind(struct udevice *parent)
|
||||
if (plat)
|
||||
return 0;
|
||||
|
||||
ctlr = dev_read_addr_ptr(parent);
|
||||
ctlr = (struct sunxi_gpio_reg *)devfdt_get_addr(parent);
|
||||
for (bank = 0; bank < soc_data->no_banks; bank++) {
|
||||
struct sunxi_gpio_platdata *plat;
|
||||
struct udevice *dev;
|
||||
|
||||
@@ -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 = dev_read_addr(dev);
|
||||
base_addr = devfdt_get_addr(dev);
|
||||
if (base_addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user