diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2019-10-20 01:47:03 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-25 13:09:27 +0100 |
| commit | 0e5bbd740647398ead41df1f791e2bc438dfb959 (patch) | |
| tree | 55702bc461b18e1fa3cb45c62423be3db638a750 /include/hw/arm | |
| parent | d05be883fc92f6f57ba1805ff2a99deb035557a2 (diff) | |
| download | focaccia-qemu-0e5bbd740647398ead41df1f791e2bc438dfb959.tar.gz focaccia-qemu-0e5bbd740647398ead41df1f791e2bc438dfb959.zip | |
hw/arm/bcm2835_peripherals: Use the SYS_timer
Connect the recently added SYS_timer. Now U-Boot does not hang anymore polling a free running counter stuck at 0. This timer is also used by the Linux kernel thermal subsystem. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20191019234715.25750-5-f4bug@amsat.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/arm')
| -rw-r--r-- | include/hw/arm/bcm2835_peripherals.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h index be7ad9b499..7859281e11 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -24,6 +24,7 @@ #include "hw/sd/sdhci.h" #include "hw/sd/bcm2835_sdhost.h" #include "hw/gpio/bcm2835_gpio.h" +#include "hw/timer/bcm2835_systmr.h" #include "hw/misc/unimp.h" #define TYPE_BCM2835_PERIPHERALS "bcm2835-peripherals" @@ -39,7 +40,7 @@ typedef struct BCM2835PeripheralState { MemoryRegion ram_alias[4]; qemu_irq irq, fiq; - UnimplementedDeviceState systmr; + BCM2835SystemTimerState systmr; UnimplementedDeviceState armtmr; UnimplementedDeviceState cprman; UnimplementedDeviceState a2w; |