diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-09-16 10:15:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-09-16 10:15:15 +0100 |
| commit | dd25f97c66a75d1508f1d4c6478ed2c95bec428f (patch) | |
| tree | 8ee113ea80fbae31c8b9d3edbe2500cb5486f5d2 /hw/timer | |
| parent | 138985c1ef8b66e4e5b383354e133e05d01d0b5f (diff) | |
| parent | 27a296fce9821e3608d537756cffa6e43a46df3b (diff) | |
| download | qemu-dd25f97c66a75d1508f1d4c6478ed2c95bec428f.zip qemu-dd25f97c66a75d1508f1d4c6478ed2c95bec428f.tar.gz qemu-dd25f97c66a75d1508f1d4c6478ed2c95bec428f.tar.bz2 | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190913' into staging
target-arm queue:
* aspeed: add a GPIO controller to the SoC
* aspeed: Various refactorings
* aspeed: Improve DMA controller modelling
* atomic_template: fix indentation in GEN_ATOMIC_HELPER
* qemu-ga: Convert invocation documentation to rST
# gpg: Signature made Fri 13 Sep 2019 16:49:05 BST
# gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg: issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg: aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20190913:
qemu-ga: Convert invocation documentation to rST
atomic_template: fix indentation in GEN_ATOMIC_HELPER
aspeed/scu: Introduce a aspeed_scu_get_apb_freq() routine
aspeed/scu: Introduce per-SoC SCU types
aspeed/smc: Calculate checksum on normal DMA
aspeed/smc: Inject errors in DMA checksum
aspeed/smc: Add DMA calibration settings
aspeed/smc: Add support for DMAs
aspeed: Use consistent typenames
aspeed: Remove unused SoC definitions
aspeed: add a GPIO controller to the SoC
hw/gpio: Add basic Aspeed GPIO model for AST2400 and AST2500
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer')
| -rw-r--r-- | hw/timer/aspeed_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 59c2bbe..2bda826 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -93,7 +93,8 @@ static inline uint32_t calculate_rate(struct AspeedTimer *t) { AspeedTimerCtrlState *s = timer_to_ctrl(t); - return timer_external_clock(t) ? TIMER_CLOCK_EXT_HZ : s->scu->apb_freq; + return timer_external_clock(t) ? TIMER_CLOCK_EXT_HZ : + aspeed_scu_get_apb_freq(s->scu); } static inline uint32_t calculate_ticks(struct AspeedTimer *t, uint64_t now_ns) |