Skip to content

Commit

Permalink
hw/arm/aspeed: Introduce TYPE_ASPEED2600_SOC
Browse files Browse the repository at this point in the history
TYPE_ASPEED2600_SOC inherits from TYPE_ASPEED_SOC.
In few commits we'll add more fields, but to keep
review process simple, don't add any yet.

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>
  • Loading branch information
philmd authored and legoater committed Oct 25, 2023
1 parent df4ab07 commit 4fc5e80
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 13 deletions.
26 changes: 13 additions & 13 deletions hw/arm/aspeed_ast2600.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,18 +646,18 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
sc->get_irq = aspeed_soc_ast2600_get_irq;
}

static const TypeInfo aspeed_soc_ast2600_type_info = {
.name = "ast2600-a3",
.parent = TYPE_ASPEED_SOC,
.instance_size = sizeof(AspeedSoCState),
.instance_init = aspeed_soc_ast2600_init,
.class_init = aspeed_soc_ast2600_class_init,
.class_size = sizeof(AspeedSoCClass),
static const TypeInfo aspeed_soc_ast2600_types[] = {
{
.name = TYPE_ASPEED2600_SOC,
.parent = TYPE_ASPEED_SOC,
.instance_size = sizeof(Aspeed2600SoCState),
.abstract = true,
}, {
.name = "ast2600-a3",
.parent = TYPE_ASPEED2600_SOC,
.instance_init = aspeed_soc_ast2600_init,
.class_init = aspeed_soc_ast2600_class_init,
},
};

static void aspeed_soc_register_types(void)
{
type_register_static(&aspeed_soc_ast2600_type_info);
};

type_init(aspeed_soc_register_types)
DEFINE_TYPES(aspeed_soc_ast2600_types)
7 changes: 7 additions & 0 deletions include/hw/arm/aspeed_soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ struct AspeedSoCState {
#define TYPE_ASPEED_SOC "aspeed-soc"
OBJECT_DECLARE_TYPE(AspeedSoCState, AspeedSoCClass, ASPEED_SOC)

struct Aspeed2600SoCState {
AspeedSoCState parent;
};

#define TYPE_ASPEED2600_SOC "aspeed2600-soc"
OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC)

struct Aspeed10x0SoCState {
AspeedSoCState parent;
};
Expand Down

0 comments on commit 4fc5e80

Please sign in to comment.