diff options
| author | Simon Glass | 2017-05-17 17:18:05 -0600 |
|---|---|---|
| committer | Simon Glass | 2017-06-01 07:03:01 -0600 |
| commit | a821c4af79e4f5ce9b629b20473863397bbe9b10 (patch) | |
| tree | 7b5da59e0db526cf6ace38b03639789996cf9b43 /drivers/block | |
| parent | d6ffb00a438ef8ba714feb2c72a7ddbdebad2b2e (diff) | |
dm: Rename dev_addr..() functions
These support the flat device tree. We want to use the dev_read_..()
prefix for functions that support both flat tree and live tree. So rename
the existing functions to avoid confusion.
In the end we will have:
1. dev_read_addr...() - works on devices, supports flat/live tree
2. devfdt_get_addr...() - current functions, flat tree only
3. of_get_address() etc. - new functions, live tree only
All drivers will be written to use 1. That function will in turn call
either 2 or 3 depending on whether the flat or live tree is in use.
Note this involves changing some dead code - the imx_lpi2c.c file.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/dwc_ahci.c | 4 | ||||
| -rw-r--r-- | drivers/block/sata_ceva.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/dwc_ahci.c b/drivers/block/dwc_ahci.c index d5bb0b887ae..b2e715023dd 100644 --- a/drivers/block/dwc_ahci.c +++ b/drivers/block/dwc_ahci.c @@ -36,10 +36,10 @@ static int dwc_ahci_ofdata_to_platdata(struct udevice *dev) plat->max_lun = fdtdec_get_uint(gd->fdt_blob, dev->of_offset, "max-lun", CONFIG_SYS_SCSI_MAX_LUN); - priv->base = map_physmem(dev_get_addr(dev), sizeof(void *), + priv->base = map_physmem(devfdt_get_addr(dev), sizeof(void *), MAP_NOCACHE); - addr = dev_get_addr_index(dev, 1); + addr = devfdt_get_addr_index(dev, 1); if (addr != FDT_ADDR_T_NONE) { priv->wrapper_base = map_physmem(addr, sizeof(void *), MAP_NOCACHE); diff --git a/drivers/block/sata_ceva.c b/drivers/block/sata_ceva.c index 9b5466483aa..65a4bb2099d 100644 --- a/drivers/block/sata_ceva.c +++ b/drivers/block/sata_ceva.c @@ -129,7 +129,7 @@ static int sata_ceva_ofdata_to_platdata(struct udevice *dev) { struct scsi_platdata *plat = dev_get_platdata(dev); - plat->base = dev_get_addr(dev); + plat->base = devfdt_get_addr(dev); if (plat->base == FDT_ADDR_T_NONE) return -EINVAL; |