diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-23 16:06:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-23 16:06:38 -0400 |
| commit | d584648dad691caec3ecc7777dbfa3f1936878e5 (patch) | |
| tree | ee787f8204c917526859da55840f6f159a00b8ba /drivers/timer | |
| parent | c84341f5acd6140f361300f02b354a7238f95b72 (diff) | |
| parent | a4020350289c520e896fd6180e510be557ed3bf9 (diff) | |
Merge tag 'dm-pull-22aug20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
replace devfdt_get_addr_ptr() with dev_read_addr_ptr()
binman fixes for portage
various minor fixes
'bind' command improvements
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/ast_timer.c | 6 | ||||
| -rw-r--r-- | drivers/timer/atmel_pit_timer.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c index 3838601f54..e313249740 100644 --- a/drivers/timer/ast_timer.c +++ b/drivers/timer/ast_timer.c @@ -64,9 +64,9 @@ static int ast_timer_ofdata_to_platdata(struct udevice *dev) { struct ast_timer_priv *priv = dev_get_priv(dev); - priv->regs = devfdt_get_addr_ptr(dev); - if (IS_ERR(priv->regs)) - return PTR_ERR(priv->regs); + priv->regs = dev_read_addr_ptr(dev); + if (!priv->regs) + return -EINVAL; priv->tmc = ast_get_timer_counter(priv->regs, AST_TICK_TIMER); diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index 70511697fe..843d670b5e 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -64,7 +64,7 @@ static int atmel_pit_ofdata_to_platdata(struct udevice *dev) { struct atmel_pit_platdata *plat = dev_get_platdata(dev); - plat->regs = (struct atmel_pit_regs *)devfdt_get_addr_ptr(dev); + plat->regs = dev_read_addr_ptr(dev); return 0; } |