From: Jamin Lin <[email protected]> The AST10x0 SoC now implements the SBC device model. However, the old unimplemented SBC mapping was left in place.
Remove the obsolete mapping now that the SBC device is implemented. Signed-off-by: Jamin Lin <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Cédric Le Goater <[email protected]> --- include/hw/arm/aspeed_soc.h | 1 - hw/arm/aspeed_ast10x0.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 8d80f1670587..cba8b7cdca58 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -92,7 +92,6 @@ struct AspeedSoCState { AspeedSBCState sbc; AspeedSLIState sli; AspeedSLIState sliio; - UnimplementedDeviceState sbc_unimplemented; AspeedSDMCState sdmc; AspeedPWMState pwm; AspeedWDTState wdt[ASPEED_WDTS_NUM]; diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c index 93c81195b56a..5165dcce5912 100644 --- a/hw/arm/aspeed_ast10x0.c +++ b/hw/arm/aspeed_ast10x0.c @@ -163,8 +163,6 @@ static void aspeed_soc_ast10x0_init(Object *obj, const char *socname) object_initialize_child(obj, "hace", &s->hace, typename); object_initialize_child(obj, "iomem", &s->iomem, TYPE_UNIMPLEMENTED_DEVICE); - object_initialize_child(obj, "sbc-unimplemented", &s->sbc_unimplemented, - TYPE_UNIMPLEMENTED_DEVICE); object_initialize_child(obj, "pwm", &s->pwm, TYPE_UNIMPLEMENTED_DEVICE); object_initialize_child(obj, "espi", &s->espi, TYPE_UNIMPLEMENTED_DEVICE); object_initialize_child(obj, "udc", &s->udc, TYPE_UNIMPLEMENTED_DEVICE); @@ -222,11 +220,6 @@ static bool aspeed_soc_ast10x0_realize(Aspeed10x0SoCState *a, Error **errp) "aspeed.io", sc->memmap[ASPEED_DEV_IOMEM], ASPEED_SOC_IOMEM_SIZE); - aspeed_mmio_map_unimplemented(s->memory, - SYS_BUS_DEVICE(&s->sbc_unimplemented), - "aspeed.sbc", sc->memmap[ASPEED_DEV_SBC], - 0x40000); - /* AST10x0 CPU Core */ armv7m = DEVICE(&a->armv7m); qdev_prop_set_uint32(armv7m, "num-irq", 256); -- 2.55.0
