summaryrefslogtreecommitdiffstats
path: root/include/hw/watchdog
diff options
context:
space:
mode:
authorPeter Maydell2021-01-28 12:41:29 +0100
committerPeter Maydell2021-01-29 16:54:42 +0100
commiteeae0b2bf4e69de27a133c87951ce52c6bfdb8b7 (patch)
tree1d0772ba2143cbb71bd90b9e85cf5e4d93eb26bb /include/hw/watchdog
parenthw/timer/cmsdk-apb-dualtimer: Add Clock input (diff)
downloadqemu-eeae0b2bf4e69de27a133c87951ce52c6bfdb8b7.tar.gz
qemu-eeae0b2bf4e69de27a133c87951ce52c6bfdb8b7.tar.xz
qemu-eeae0b2bf4e69de27a133c87951ce52c6bfdb8b7.zip
hw/watchdog/cmsdk-apb-watchdog: Add Clock input
As the first step in converting the CMSDK_APB_TIMER device to the Clock framework, add a Clock input. For the moment we do nothing with this clock; we will change the behaviour from using the wdogclk-frq property to using the Clock once all the users of this device have been converted to wire up the Clock. This is a migration compatibility break for machines mps2-an385, mps2-an386, mps2-an500, mps2-an511, mps2-an505, mps2-an521, musca-a, musca-b1, lm3s811evb, lm3s6965evb. 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-10-peter.maydell@linaro.org Message-id: 20210121190622.22000-10-peter.maydell@linaro.org
Diffstat (limited to 'include/hw/watchdog')
-rw-r--r--include/hw/watchdog/cmsdk-apb-watchdog.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog/cmsdk-apb-watchdog.h
index 3da0d43e35..34069ca696 100644
--- a/include/hw/watchdog/cmsdk-apb-watchdog.h
+++ b/include/hw/watchdog/cmsdk-apb-watchdog.h
@@ -17,6 +17,7 @@
*
* QEMU interface:
* + QOM property "wdogclk-frq": frequency at which the watchdog is clocked
+ * + Clock input "WDOGCLK": clock for the watchdog's timer
* + sysbus MMIO region 0: the register bank
* + sysbus IRQ 0: watchdog interrupt
*
@@ -33,6 +34,7 @@
#include "hw/sysbus.h"
#include "hw/ptimer.h"
+#include "hw/clock.h"
#include "qom/object.h"
#define TYPE_CMSDK_APB_WATCHDOG "cmsdk-apb-watchdog"
@@ -54,6 +56,7 @@ struct CMSDKAPBWatchdog {
uint32_t wdogclk_frq;
bool is_luminary;
struct ptimer_state *timer;
+ Clock *wdogclk;
uint32_t control;
uint32_t intstatus;