diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-24 15:42:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-24 15:42:06 +0300 |
| commit | 7208396bbf1df1c7a85d263b7ff054e6b45d8240 (patch) | |
| tree | 41b20866e0a94e34ca76e54a2745ca7a5ba0889b /drivers/timer | |
| parent | 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7 (diff) | |
| download | u-boot-7208396bbf1df1c7a85d263b7ff054e6b45d8240.tar.xz | |
Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing
changes made to 56d37f1c564107e27d873181d838571b7d7860e7.
Unfortunately this is causing CI failures:
https://travis-ci.org/github/trini/u-boot/jobs/711313649
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/ag101p_timer.c | 2 | ||||
| -rw-r--r-- | drivers/timer/altera_timer.c | 2 | ||||
| -rw-r--r-- | drivers/timer/atcpit100_timer.c | 2 | ||||
| -rw-r--r-- | drivers/timer/omap-timer.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index c011906b93..6e20b4fc33 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -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(dev_read_addr(dev), + plat->regs = map_physmem(devfdt_get_addr(dev), sizeof(struct atftmr_timer_regs), MAP_NOCACHE); return 0; diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 6cb2923e0b..6ca9501eb1 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -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(dev_read_addr(dev), + plat->regs = map_physmem(devfdt_get_addr(dev), sizeof(struct altera_timer_regs), MAP_NOCACHE); diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index 5d4ae68509..c5d43b4a4a 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -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(dev_read_addr(dev), 0x100 , MAP_NOCACHE); + plat->regs = map_physmem(devfdt_get_addr(dev) , 0x100 , MAP_NOCACHE); return 0; } diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c index cf3d27b96b..700c349f37 100644 --- a/drivers/timer/omap-timer.c +++ b/drivers/timer/omap-timer.c @@ -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(dev_read_addr(dev), + priv->regs = map_physmem(devfdt_get_addr(dev), sizeof(struct omap_gptimer_regs), MAP_NOCACHE); return 0; |