Failed in applying to current master (
apply log)
docs/system/arm/aspeed.rst | 4 +-
include/hw/arm/aspeed.h | 1 +
include/hw/sd/sdhci.h | 5 +
include/hw/timer/aspeed_timer.h | 1 +
hw/arm/aspeed.c | 15 +-
hw/arm/aspeed_ast27x0.c | 17 ++
hw/sd/sdhci.c | 6 +
hw/timer/aspeed_timer.c | 263 ++++++++++++++++++++++++++--
hw/watchdog/wdt_aspeed.c | 19 +-
hw/timer/trace-events | 2 +-
tests/functional/aspeed.py | 2 +-
tests/functional/test_aarch64_aspeed.py | 10 +-
tests/functional/test_arm_aspeed_ast2500.py | 8 +-
tests/functional/test_arm_aspeed_ast2600.py | 8 +-
14 files changed, 323 insertions(+), 38 deletions(-)