diff options
authorPeter Maydell <peter.maydell@linaro.org>2021-01-28 11:41:45 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-01-29 10:47:29 +0000
commit11749122e1a86866591306d43603d2795a3dea1a (patch)
parent824ffc3f1ebc3769b1a6f7fd13124fa741e4df8e (diff)
hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYSpull-target-arm-20210129
Now that the watchdog device uses its Clock input rather than being passed the value of system_clock_scale at creation time, we can remove the hack where we reset the STELLARIS_SYS at board creation time to force it to set system_clock_scale. Instead it will be reset at the usual point in startup and will inform the watchdog of the clock frequency at that point. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Luc Michel <luc@lmichel.fr> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20210128114145.20536-26-peter.maydell@linaro.org Message-id: 20210121190622.22000-26-peter.maydell@linaro.org Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
1 files changed, 0 insertions, 10 deletions
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 5acb043a07..ad72c0959f 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -780,16 +780,6 @@ static DeviceState *stellaris_sys_init(uint32_t base, qemu_irq irq,
sysbus_mmio_map(sbd, 0, base);
sysbus_connect_irq(sbd, 0, irq);
- /*
- * Normally we should not be resetting devices like this during
- * board creation. For the moment we need to do so, because
- * system_clock_scale will only get set when the STELLARIS_SYS
- * device is reset, and we need its initial value to pass to
- * the watchdog device. This hack can be removed once the
- * watchdog has been converted to use a Clock input instead.
- */
- device_cold_reset(dev);
return dev;