| Message ID | 20210121190622.22000-26-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Convert CMSDK timer, watchdog, dualtimer to Clock framework | expand |
On 19:06 Thu 21 Jan , Peter Maydell wrote: > 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> > --- > hw/arm/stellaris.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index 5acb043a07e..ad72c0959f1 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; > } > > -- > 2.20.1 > --
On 1/21/21 8:06 PM, Peter Maydell wrote: > 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> > --- > hw/arm/stellaris.c | 10 ---------- > 1 file changed, 10 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 5acb043a07e..ad72c0959f1 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; }
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> --- hw/arm/stellaris.c | 10 ---------- 1 file changed, 10 deletions(-)