diff options
author | Peter Maydell | 2021-01-28 12:41:31 +0100 |
---|---|---|
committer | Peter Maydell | 2021-01-29 16:54:42 +0100 |
commit | 8fd34dc0c484850c7b1126a484add00df0374c98 (patch) | |
tree | 6398955963e0a336810e7578dc8d8df61fe29b22 /include/hw/arm | |
parent | hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ" (diff) | |
download | qemu-8fd34dc0c484850c7b1126a484add00df0374c98.tar.gz qemu-8fd34dc0c484850c7b1126a484add00df0374c98.tar.xz qemu-8fd34dc0c484850c7b1126a484add00df0374c98.zip |
hw/arm/armsse: Wire up clocks
Create two input clocks on the ARMSSE devices, one for the normal
MAINCLK, and one for the 32KHz S32KCLK, and wire these up to the
appropriate devices. The old property-based clock frequency setting
will remain in place until conversion is complete.
This is a migration compatibility break for machines mps2-an505,
mps2-an521, musca-a, musca-b1.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210128114145.20536-12-peter.maydell@linaro.org
Message-id: 20210121190622.22000-12-peter.maydell@linaro.org
Diffstat (limited to 'include/hw/arm')
-rw-r--r-- | include/hw/arm/armsse.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 4860a793f4..bfa1e79c4f 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -37,6 +37,8 @@ * per-CPU identity and control register blocks * * QEMU interface: + * + Clock input "MAINCLK": clock for CPUs and most peripherals + * + Clock input "S32KCLK": slow 32KHz clock used for a few peripherals * + QOM property "memory" is a MemoryRegion containing the devices provided * by the board model. * + QOM property "MAINCLK_FRQ" is the frequency of the main system clock @@ -103,6 +105,7 @@ #include "hw/misc/armsse-mhu.h" #include "hw/misc/unimp.h" #include "hw/or-irq.h" +#include "hw/clock.h" #include "hw/core/split-irq.h" #include "hw/cpu/cluster.h" #include "qom/object.h" @@ -209,6 +212,9 @@ struct ARMSSE { uint32_t nsccfg; + Clock *mainclk; + Clock *s32kclk; + /* Properties */ MemoryRegion *board_memory; uint32_t exp_numirq; |