Re: [PATCH 07/24] hw/arm/mps2-tz: Make FPGAIO switch and LED config per-board

From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm <qemu-arm@nongnu.org>, QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PATCH 07/24] hw/arm/mps2-tz: Make FPGAIO switch and LED config per-board
Date: Fri, 12 Feb 2021 13:51:44 +0000	[thread overview]
Message-ID: <CAFEAcA-pDBHjZqswjEo4S9sLOao3vnOM05HdjRhJOGY4Q-GkiQ@mail.gmail.com> (raw)
In-Reply-To: <20210205170019.25319-8-peter.maydell@linaro.org>

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

