Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
binman support for FIT new UCLASS_SOC patman switch 'test' command minor fdt fixes patman usability improvements
This commit is contained in:
@@ -34,7 +34,7 @@ static int aspeed_sdhci_probe(struct udevice *dev)
|
||||
goto free;
|
||||
|
||||
host->name = dev->name;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
|
||||
max_clk = clk_get_rate(&clk);
|
||||
if (IS_ERR_VALUE(max_clk)) {
|
||||
|
||||
@@ -69,7 +69,7 @@ static int atmel_sdhci_probe(struct udevice *dev)
|
||||
return ret;
|
||||
|
||||
host->name = dev->name;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
|
||||
host->quirks = SDHCI_QUIRK_WAIT_SEND_CMD;
|
||||
host->bus_width = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -395,7 +395,7 @@ static int ftsdc010_mmc_ofdata_to_platdata(struct udevice *dev)
|
||||
struct ftsdc_priv *priv = dev_get_priv(dev);
|
||||
struct ftsdc010_chip *chip = &priv->chip;
|
||||
chip->name = dev->name;
|
||||
chip->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
chip->ioaddr = dev_read_addr_ptr(dev);
|
||||
chip->buswidth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
|
||||
"bus-width", 4);
|
||||
chip->priv = dev;
|
||||
|
||||
@@ -33,7 +33,7 @@ static int hi6220_dwmmc_ofdata_to_platdata(struct udevice *dev)
|
||||
struct dwmci_host *host = &priv->host;
|
||||
|
||||
host->name = dev->name;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
host->buswidth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
|
||||
"bus-width", 4);
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@ static int iproc_sdhci_probe(struct udevice *dev)
|
||||
iproc_host->shadow_blk = 0;
|
||||
|
||||
host->name = dev->name;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
host->voltages = MMC_VDD_165_195 |
|
||||
MMC_VDD_32_33 | MMC_VDD_33_34;
|
||||
host->quirks = SDHCI_QUIRK_BROKEN_VOLTAGE | SDHCI_QUIRK_BROKEN_R1B;
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -171,7 +171,7 @@ static int msm_ofdata_to_platdata(struct udevice *dev)
|
||||
int node = dev_of_offset(dev);
|
||||
|
||||
host->name = strdup(dev->name);
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
host->bus_width = fdtdec_get_int(gd->fdt_blob, node, "bus-width", 4);
|
||||
host->index = fdtdec_get_uint(gd->fdt_blob, node, "index", 0);
|
||||
priv->base = (void *)fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
|
||||
|
||||
@@ -112,7 +112,7 @@ static int mv_sdhci_probe(struct udevice *dev)
|
||||
int ret;
|
||||
|
||||
host->name = MVSDH_NAME;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
host->quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_WAIT_SEND_CMD;
|
||||
host->mmc = &plat->mmc;
|
||||
host->mmc->dev = dev;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
|
||||
}
|
||||
|
||||
host->name = dev->name;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
host->buswidth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
|
||||
"bus-width", 4);
|
||||
host->clksel = socfpga_dwmci_clksel;
|
||||
|
||||
@@ -116,7 +116,7 @@ static int sti_sdhci_ofdata_to_platdata(struct udevice *dev)
|
||||
struct sdhci_host *host = dev_get_priv(dev);
|
||||
|
||||
host->name = strdup(dev->name);
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
|
||||
host->bus_width = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
|
||||
"bus-width", 4);
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -455,7 +455,7 @@ static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev)
|
||||
const char *name;
|
||||
|
||||
host->name = dev->name;
|
||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
||||
host->ioaddr = dev_read_addr_ptr(dev);
|
||||
|
||||
if (device_is_compatible(dev, "marvell,armada-3700-sdhci"))
|
||||
priv->pad_ctrl_reg = (void *)devfdt_get_addr_index(dev, 1);
|
||||
|
||||
Reference in New Issue
Block a user