From: Ed Tanous Date: Thu, 3 Jul 2025 14:42:46 +0000 (-0700) Subject: hw/arm/aspeed: Add second SPI chip to Aspeed model X-Git-Tag: v10.1.0-rc0~34^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92096685a00414a813aa4735db1706e4e5c6917d;p=thirdparty%2Fqemu.git hw/arm/aspeed: Add second SPI chip to Aspeed model Aspeed2600 has two spi lanes; Add a new struct that can mount the second SPI. Signed-off-by: Ed Tanous Reviewed-by: Cédric Le Goater Link: https://lore.kernel.org/qemu-devel/20250703144249.3348879-2-etanous@nvidia.com Signed-off-by: Cédric Le Goater --- diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 94897505f8e..8d7757e11f1 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -465,6 +465,8 @@ static void aspeed_machine_init(MachineState *machine) aspeed_board_init_flashes(&bmc->soc->spi[0], bmc->spi_model ? bmc->spi_model : amc->spi_model, 1, amc->num_cs); + aspeed_board_init_flashes(&bmc->soc->spi[1], + amc->spi2_model, 1, amc->num_cs2); } if (machine->kernel_filename && sc->num_cpus > 1) { diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index 973277bea65..6c364556565 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -35,7 +35,9 @@ struct AspeedMachineClass { uint32_t hw_strap2; const char *fmc_model; const char *spi_model; + const char *spi2_model; uint32_t num_cs; + uint32_t num_cs2; uint32_t macs_mask; void (*i2c_init)(AspeedMachineState *bmc); uint32_t uart_default;