| Message ID | 20210205170019.25319-8-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/arm: New board model mps3-an524 | expand |
On Fri, 5 Feb 2021 at 17:00, Peter Maydell <peter.maydell@linaro.org> wrote: > > Set the FPGAIO num-leds and have-switches properties explicitly > per-board, rather than relying on the defaults. The AN505 and AN521 > both have the same settings as the default values, but the AN524 will > be different. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Followon from the update to the previous patch, trivial rename to squash in: diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 94618ae54d2..6e345cf1f09 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -80,7 +80,7 @@ struct MPS2TZMachineClass { uint32_t len_oscclk; const uint32_t *oscclk; uint32_t fpgaio_num_leds; /* Number of LEDs in FPGAIO LED0 register */ - bool fpgaio_switches; /* Does FPGAIO have SWITCH register? */ + bool fpgaio_has_switches; /* Does FPGAIO have SWITCH register? */ const char *armsse_type; }; @@ -247,7 +247,7 @@ static MemoryRegion *make_fpgaio(MPS2TZMachineState *mms, void *opaque, object_initialize_child(OBJECT(mms), "fpgaio", fpgaio, TYPE_MPS2_FPGAIO); qdev_prop_set_uint32(DEVICE(fpgaio), "num-leds", mmc->fpgaio_num_leds); - qdev_prop_set_bit(DEVICE(fpgaio), "have-switches", mmc->fpgaio_switches); + qdev_prop_set_bit(DEVICE(fpgaio), "has-switches", mmc->fpgaio_has_switches); sysbus_realize(SYS_BUS_DEVICE(fpgaio), &error_fatal); return sysbus_mmio_get_region(SYS_BUS_DEVICE(fpgaio), 0); } @@ -693,7 +693,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->oscclk = an505_oscclk; mmc->len_oscclk = ARRAY_SIZE(an505_oscclk); mmc->fpgaio_num_leds = 2; - mmc->fpgaio_switches = false; + mmc->fpgaio_has_switches = false; mmc->armsse_type = TYPE_IOTKIT; } @@ -713,7 +713,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->oscclk = an505_oscclk; /* AN521 is the same as AN505 here */ mmc->len_oscclk = ARRAY_SIZE(an505_oscclk); mmc->fpgaio_num_leds = 2; - mmc->fpgaio_switches = false; + mmc->fpgaio_has_switches = false; mmc->armsse_type = TYPE_SSE200; } thanks -- PMM
On 2/12/21 2:51 PM, Peter Maydell wrote: > On Fri, 5 Feb 2021 at 17:00, Peter Maydell <peter.maydell@linaro.org> wrote: >> >> Set the FPGAIO num-leds and have-switches properties explicitly >> per-board, rather than relying on the defaults. The AN505 and AN521 >> both have the same settings as the default values, but the AN524 will >> be different. >> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > Followon from the update to the previous patch, trivial rename > to squash in: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 9add1453cc2..94618ae54d2 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -79,6 +79,8 @@ struct MPS2TZMachineClass { uint32_t sysclk_frq; /* Main SYSCLK frequency in Hz */ uint32_t len_oscclk; const uint32_t *oscclk; + uint32_t fpgaio_num_leds; /* Number of LEDs in FPGAIO LED0 register */ + bool fpgaio_switches; /* Does FPGAIO have SWITCH register? */ const char *armsse_type; }; @@ -241,8 +243,11 @@ static MemoryRegion *make_fpgaio(MPS2TZMachineState *mms, void *opaque, const char *name, hwaddr size) { MPS2FPGAIO *fpgaio = opaque; + MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms); object_initialize_child(OBJECT(mms), "fpgaio", fpgaio, TYPE_MPS2_FPGAIO); + qdev_prop_set_uint32(DEVICE(fpgaio), "num-leds", mmc->fpgaio_num_leds); + qdev_prop_set_bit(DEVICE(fpgaio), "have-switches", mmc->fpgaio_switches); sysbus_realize(SYS_BUS_DEVICE(fpgaio), &error_fatal); return sysbus_mmio_get_region(SYS_BUS_DEVICE(fpgaio), 0); } @@ -687,6 +692,8 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */ mmc->oscclk = an505_oscclk; mmc->len_oscclk = ARRAY_SIZE(an505_oscclk); + mmc->fpgaio_num_leds = 2; + mmc->fpgaio_switches = false; mmc->armsse_type = TYPE_IOTKIT; } @@ -705,6 +712,8 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */ mmc->oscclk = an505_oscclk; /* AN521 is the same as AN505 here */ mmc->len_oscclk = ARRAY_SIZE(an505_oscclk); + mmc->fpgaio_num_leds = 2; + mmc->fpgaio_switches = false; mmc->armsse_type = TYPE_SSE200; }
Set the FPGAIO num-leds and have-switches properties explicitly per-board, rather than relying on the defaults. The AN505 and AN521 both have the same settings as the default values, but the AN524 will be different. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/arm/mps2-tz.c | 9 +++++++++ 1 file changed, 9 insertions(+)