diff options
author | Tom Rini | 2019-04-24 12:26:25 -0400 |
---|---|---|
committer | Tom Rini | 2019-04-24 12:26:25 -0400 |
commit | ceb6ddbc73607e9395bb5f0ad94159755f049e77 (patch) | |
tree | 626729342d117934be03db50981a4bba8ebcceca /drivers/timer | |
parent | 3fbd2dce351ab5d40d3244f26bd713caa4f826e2 (diff) | |
parent | c6e4e8f99c1430e803dc2ef306935a93b46dad7c (diff) |
Merge tag 'u-boot-amlogic-20190423' of git://git.denx.de/u-boot-amlogic
- Add support for Amlogic p200 & p201 Reference Designs
- Add Amlogic SoC information display
- Add support for the Libretech-AC AML-S805X-AC board
- Add Amlogic AXG reset compatible
- Add I2C support for Amlogic AXG
- Fix AXG PIN and BANK pinctrl definitions
- Fix regmap_read_poll_timeout warning about sandbox_timer_add_offset
- Add initial support for Amlogic G12A SoC and U200 board
- Enable PHY_REALTEK for selected boards
- Fix Khadas VIM2 README
Diffstat (limited to 'drivers/timer')
-rw-r--r-- | drivers/timer/sandbox_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c index 6d2b045fe86..5228486082c 100644 --- a/drivers/timer/sandbox_timer.c +++ b/drivers/timer/sandbox_timer.c @@ -14,7 +14,7 @@ /* system timer offset in ms */ static unsigned long sandbox_timer_offset; -void sandbox_timer_add_offset(unsigned long offset) +void timer_test_add_offset(unsigned long offset) { sandbox_timer_offset += offset; } |