[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/24] hw/arm/mps2-tz: Make FPGAIO switch and LED config per-boar
From: |
Peter Maydell |
Subject: |
[PATCH 07/24] hw/arm/mps2-tz: Make FPGAIO switch and LED config per-board |
Date: |
Fri, 5 Feb 2021 17:00:02 +0000 |
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(+)
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;
}
--
2.20.1
- [PATCH 08/24] hw/arm/mps2-tz: Condition IRQ splitting on number of CPUs, not board type, (continued)
- [PATCH 08/24] hw/arm/mps2-tz: Condition IRQ splitting on number of CPUs, not board type, Peter Maydell, 2021/02/05
- [PATCH 13/24] hw/arm/mps2-tz: Move device IRQ info to data structures, Peter Maydell, 2021/02/05
- [PATCH 05/24] hw/misc/mps2-fpgaio: Make number of LEDs configurable by board, Peter Maydell, 2021/02/05
- [PATCH 06/24] hw/misc/mps2-fpgaio: Support SWITCH register, Peter Maydell, 2021/02/05
- Re: [PATCH 06/24] hw/misc/mps2-fpgaio: Support SWITCH register, Philippe Mathieu-Daudé, 2021/02/12
- [PATCH 07/24] hw/arm/mps2-tz: Make FPGAIO switch and LED config per-board,
Peter Maydell <=
- [PATCH 20/24] hw/arm/mps2-tz: Add new mps3-an524 board, Peter Maydell, 2021/02/05
- [PATCH 10/24] hw/misc/mps2-scc: Implement CFG_REG5 and CFG_REG6 for MPS3 AN524, Peter Maydell, 2021/02/05
- [PATCH 09/24] hw/arm/mps2-tz: Make number of IRQs board-specific, Peter Maydell, 2021/02/05
- [PATCH 03/24] hw/arm/mps2-tz: Correct the OSCCLK settings for mps2-an505 and mps2-an511, Peter Maydell, 2021/02/05