[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/12] hw/arm/aspeed: Rename aspeed_soc_init() as AST2400/2500 spe
From: |
Cédric Le Goater |
Subject: |
[PULL 03/12] hw/arm/aspeed: Rename aspeed_soc_init() as AST2400/2500 specific |
Date: |
Wed, 25 Oct 2023 10:59:12 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index f6c2ead4ace0..bb377e9e6e32 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -140,7 +140,7 @@ static qemu_irq aspeed_soc_ast2400_get_irq(AspeedSoCState
*s, int dev)
return qdev_get_gpio_in(DEVICE(&s->vic), sc->irqmap[dev]);
}
-static void aspeed_soc_init(Object *obj)
+static void aspeed_ast2400_soc_init(Object *obj)
{
AspeedSoCState *s = ASPEED_SOC(obj);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
@@ -546,7 +546,7 @@ static void aspeed_soc_ast2400_class_init(ObjectClass *oc,
void *data)
static const TypeInfo aspeed_soc_ast2400_type_info = {
.name = "ast2400-a1",
.parent = TYPE_ASPEED_SOC,
- .instance_init = aspeed_soc_init,
+ .instance_init = aspeed_ast2400_soc_init,
.instance_size = sizeof(AspeedSoCState),
.class_init = aspeed_soc_ast2400_class_init,
};
@@ -573,7 +573,7 @@ static void aspeed_soc_ast2500_class_init(ObjectClass *oc,
void *data)
static const TypeInfo aspeed_soc_ast2500_type_info = {
.name = "ast2500-a1",
.parent = TYPE_ASPEED_SOC,
- .instance_init = aspeed_soc_init,
+ .instance_init = aspeed_ast2400_soc_init,
.instance_size = sizeof(AspeedSoCState),
.class_init = aspeed_soc_ast2500_class_init,
};
--
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, 2023/10/25
- [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 <=
- [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
- Re: [PULL 00/12] aspeed queue, Stefan Hajnoczi, 2023/10/27