[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/12] hw/arm/aspeed: Rename aspeed_soc_realize() as AST2400/2500
From: |
Cédric Le Goater |
Subject: |
[PULL 04/12] hw/arm/aspeed: Rename aspeed_soc_realize() as AST2400/2500 specific |
Date: |
Wed, 25 Oct 2023 10:59:13 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Keep aspeed_soc_class_init() generic, set the realize handler
to aspeed_ast2400_soc_realize() in each 2400/2500 class_init.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/aspeed_soc.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index bb377e9e6e32..191276a3203d 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -239,7 +239,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
object_initialize_child(obj, "video", &s->video,
TYPE_UNIMPLEMENTED_DEVICE);
}
-static void aspeed_soc_realize(DeviceState *dev, Error **errp)
+static void aspeed_ast2400_soc_realize(DeviceState *dev, Error **errp)
{
int i;
AspeedSoCState *s = ASPEED_SOC(dev);
@@ -509,9 +509,6 @@ static void aspeed_soc_class_init(ObjectClass *oc, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
- dc->realize = aspeed_soc_realize;
- /* Reason: Uses serial_hds and nd_table in realize() directly */
- dc->user_creatable = false;
device_class_set_props(dc, aspeed_soc_properties);
}
@@ -527,6 +524,11 @@ static const TypeInfo aspeed_soc_type_info = {
static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data)
{
AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc);
+ DeviceClass *dc = DEVICE_CLASS(oc);
+
+ dc->realize = aspeed_ast2400_soc_realize;
+ /* Reason: Uses serial_hds and nd_table in realize() directly */
+ dc->user_creatable = false;
sc->name = "ast2400-a1";
sc->cpu_type = ARM_CPU_TYPE_NAME("arm926");
@@ -554,6 +556,11 @@ static const TypeInfo aspeed_soc_ast2400_type_info = {
static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data)
{
AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc);
+ DeviceClass *dc = DEVICE_CLASS(oc);
+
+ dc->realize = aspeed_ast2400_soc_realize;
+ /* Reason: Uses serial_hds and nd_table in realize() directly */
+ dc->user_creatable = false;
sc->name = "ast2500-a1";
sc->cpu_type = ARM_CPU_TYPE_NAME("arm1176");
--
2.41.0
- [PULL 00/12] aspeed queue, Cédric Le Goater, 2023/10/25
- [PULL 02/12] hw/arm/aspeed: Extract code common to all boards to a common file, Cédric Le Goater, 2023/10/25
- [PULL 04/12] hw/arm/aspeed: Rename aspeed_soc_realize() as AST2400/2500 specific,
Cédric Le Goater <=
- [PULL 05/12] hw/arm/aspeed: Dynamically allocate AspeedMachineState::soc field, Cédric Le Goater, 2023/10/25
- [PULL 01/12] MAINTAINERS: aspeed: Update Andrew's email address, Cédric Le Goater, 2023/10/25
- [PULL 07/12] hw/arm/aspeed: Introduce TYPE_ASPEED2600_SOC, Cédric Le Goater, 2023/10/25
- [PULL 06/12] hw/arm/aspeed: Introduce TYPE_ASPEED10X0_SOC, Cédric Le Goater, 2023/10/25
- [PULL 03/12] hw/arm/aspeed: Rename aspeed_soc_init() as AST2400/2500 specific, Cédric Le Goater, 2023/10/25
- [PULL 08/12] hw/arm/aspeed: Introduce TYPE_ASPEED2400_SOC, Cédric Le Goater, 2023/10/25
- [PULL 11/12] hw/arm/aspeed: Move AspeedSoCState::a7mpcore to Aspeed2600SoCState, Cédric Le Goater, 2023/10/25
- [PULL 10/12] hw/arm/aspeed: Move AspeedSoCState::armv7m to Aspeed10x0SoCState, Cédric Le Goater, 2023/10/25
- [PULL 12/12] hw/arm/aspeed: Move AspeedSoCState::cpu/vic to Aspeed2400SoCState, Cédric Le Goater, 2023/10/25
- [PULL 09/12] hw/arm/aspeed: Check 'memory' link is set in common aspeed_soc_realize, Cédric Le Goater, 2023/10/25