From: Kane-Chen-AS <[email protected]> Connect the SPI device to AST1700 model.
Signed-off-by: Kane-Chen-AS <[email protected]> --- include/hw/misc/aspeed_ast1700.h | 1 + hw/misc/aspeed_ast1700.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/include/hw/misc/aspeed_ast1700.h b/include/hw/misc/aspeed_ast1700.h index 391c8687f5..e55deea67a 100644 --- a/include/hw/misc/aspeed_ast1700.h +++ b/include/hw/misc/aspeed_ast1700.h @@ -33,6 +33,7 @@ struct AspeedAST1700SoCState { AspeedLTPIState ltpi; SerialMM uart; MemoryRegion sram; + AspeedSMCState spi; }; #endif /* ASPEED_AST1700_H */ diff --git a/hw/misc/aspeed_ast1700.c b/hw/misc/aspeed_ast1700.c index 6f7ff625b5..ba44e484e8 100644 --- a/hw/misc/aspeed_ast1700.c +++ b/hw/misc/aspeed_ast1700.c @@ -20,15 +20,19 @@ #define AST1700_SOC_SRAM_SIZE 0x00040000 enum { + ASPEED_AST1700_DEV_SPI0, ASPEED_AST1700_DEV_SRAM, ASPEED_AST1700_DEV_UART12, ASPEED_AST1700_DEV_LTPI_CTRL, + ASPEED_AST1700_DEV_SPI0_MEM, }; static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_SPI0] = 0x00030000, [ASPEED_AST1700_DEV_SRAM] = 0x00BC0000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, + [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000, }; static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) { @@ -76,6 +80,20 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_UART12], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart), 0)); + /* SPI */ + object_property_set_link(OBJECT(&s->spi), "dram", + OBJECT(&s->iomem), &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi), errp)) { + return; + } + memory_region_add_subregion(&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0], + sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->spi), 0)); + + memory_region_add_subregion(&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0_MEM], + sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->spi), 1)); + /* LTPI controller */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->ltpi), errp)) { return; @@ -88,11 +106,21 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) static void aspeed_ast1700_instance_init(Object *obj) { AspeedAST1700SoCState *s = ASPEED_AST1700(obj); + char socname[8]; + char typename[64]; + + if (sscanf(object_get_typename(obj), "aspeed.ast1700-%7s", socname) != 1) { + g_assert_not_reached(); + } /* UART */ object_initialize_child(obj, "uart[*]", &s->uart, TYPE_SERIAL_MM); + /* SPI */ + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", 0, socname); + object_initialize_child(obj, "ioexp-spi[*]", &s->spi, + typename); /* LTPI controller */ object_initialize_child(obj, "ltpi-ctrl", &s->ltpi, TYPE_ASPEED_LTPI); -- 2.43.0
