On 1/21/21 8:06 PM, Peter Maydell wrote: > While we transition the ARMSSE code from integer properties > specifying clock frequencies to Clock objects, we want to have the > device provide both at once. We want the final name of the main > input Clock to be "MAINCLK", following the hardware name. > Unfortunately creating an input Clock with a name X creates an > under-the-hood QOM property X; for "MAINCLK" this clashes with the > existing UINT32 property of that name. > > Rename the UINT32 property to MAINCLK_FRQ so it can coexist with the > MAINCLK Clock; once the transition is complete MAINCLK_FRQ will be > deleted. > > Commit created with: > perl -p -i -e 's/MAINCLK/MAINCLK_FRQ/g' hw/arm/{armsse,mps2-tz,musca}.c > include/hw/arm/armsse.h > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > --- > include/hw/arm/armsse.h | 2 +- > hw/arm/armsse.c | 6 +++--- > hw/arm/mps2-tz.c | 2 +- > hw/arm/musca.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>