[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_
From: |
Peter Maydell |
Subject: |
[PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS |
Date: |
Fri, 29 Jan 2021 11:00:12 +0000 |
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>
---
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
- [PULL 30/46] hw/watchdog/cmsdk-apb-watchdog: Add Clock input, (continued)
- [PULL 30/46] hw/watchdog/cmsdk-apb-watchdog: Add Clock input, Peter Maydell, 2021/01/29
- [PULL 41/46] hw/watchdog/cmsdk-apb-watchdog: Convert to use Clock input, Peter Maydell, 2021/01/29
- [PULL 40/46] hw/timer/cmsdk-apb-dualtimer: Convert to use Clock input, Peter Maydell, 2021/01/29
- [PULL 28/46] hw/timer/cmsdk-apb-timer: Add Clock input, Peter Maydell, 2021/01/29
- [PULL 42/46] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes, Peter Maydell, 2021/01/29
- [PULL 44/46] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE, Peter Maydell, 2021/01/29
- [PULL 45/46] arm: Remove frq properties on CMSDK timer, dualtimer, watchdog, ARMSSE, Peter Maydell, 2021/01/29
- [PULL 31/46] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ", Peter Maydell, 2021/01/29
- [PULL 35/46] hw/arm/mps2-tz: Create and connect ARMSSE Clocks, Peter Maydell, 2021/01/29
- [PULL 37/46] hw/arm/stellaris: Convert SSYS to QOM device, Peter Maydell, 2021/01/29
- [PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS,
Peter Maydell <=
- [PULL 39/46] hw/timer/cmsdk-apb-timer: Convert to use Clock input, Peter Maydell, 2021/01/29
- [PULL 43/46] hw/arm/armsse: Use Clock to set system_clock_scale, Peter Maydell, 2021/01/29
- Re: [PULL 00/46] target-arm queue, no-reply, 2021/01/29