ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/aspeed: Rename aspeed_soc_realize() as AST2400/2500 specific 

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>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-24 18:24:14 +02:00 committed by Cédric Le Goater
parent a150836239
commit aa6c6697bb
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/arm/aspeed_soc.c
View File

@ -239,7 +239,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
object_initialize_child(obj, "video", &s->video, TYPE_UNIMPLEMENTED_DEVICE); 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; int i;
AspeedSoCState *s = ASPEED_SOC(dev); AspeedSoCState *s = ASPEED_SOC(dev);
@ -509,9 +509,6 @@ static void aspeed_soc_class_init(ObjectClass *oc, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(oc); 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); 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) static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data)
{ {
AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); 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->name = "ast2400-a1";
sc->cpu_type = ARM_CPU_TYPE_NAME("arm926"); 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) static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data)
{ {
AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); 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->name = "ast2500-a1";
sc->cpu_type = ARM_CPU_TYPE_NAME("arm1176"); sc->cpu_type = ARM_CPU_TYPE_NAME("arm1176");