On Tue, Dec 23, 2025 at 5:42 PM Kane Chen <[email protected]> wrote: > > From: Kane-Chen-AS <[email protected]> > > Connect the GPIO controller to the AST1700 model by mapping its MMIO > region and wiring its interrupt line. > > Signed-off-by: Kane-Chen-AS <[email protected]> > Reviewed-by: Cédric Le Goater <[email protected]>
Reviewed-by: Nabih Estefan <[email protected]> Tested-by: Nabih Estefan <[email protected]> > --- > include/hw/arm/aspeed_ast1700.h | 2 ++ > hw/arm/aspeed_ast1700.c | 14 ++++++++++++++ > hw/arm/aspeed_ast27x0.c | 4 ++++ > 3 files changed, 20 insertions(+) > > diff --git a/include/hw/arm/aspeed_ast1700.h b/include/hw/arm/aspeed_ast1700.h > index 12c57145c6..7ea6ff4c1a 100644 > --- a/include/hw/arm/aspeed_ast1700.h > +++ b/include/hw/arm/aspeed_ast1700.h > @@ -11,6 +11,7 @@ > #include "hw/sysbus.h" > #include "hw/misc/aspeed_scu.h" > #include "hw/adc/aspeed_adc.h" > +#include "hw/gpio/aspeed_gpio.h" > #include "hw/misc/aspeed_ltpi.h" > #include "hw/ssi/aspeed_smc.h" > #include "hw/char/serial-mm.h" > @@ -32,6 +33,7 @@ struct AspeedAST1700SoCState { > AspeedSMCState spi; > AspeedADCState adc; > AspeedSCUState scu; > + AspeedGPIOState gpio; > }; > > #endif /* ASPEED_AST1700_H */ > diff --git a/hw/arm/aspeed_ast1700.c b/hw/arm/aspeed_ast1700.c > index 6494a5c4eb..9a6019908e 100644 > --- a/hw/arm/aspeed_ast1700.c > +++ b/hw/arm/aspeed_ast1700.c > @@ -21,6 +21,7 @@ enum { > ASPEED_AST1700_DEV_SRAM, > ASPEED_AST1700_DEV_ADC, > ASPEED_AST1700_DEV_SCU, > + ASPEED_AST1700_DEV_GPIO, > ASPEED_AST1700_DEV_UART12, > ASPEED_AST1700_DEV_LTPI_CTRL, > ASPEED_AST1700_DEV_SPI0_MEM, > @@ -31,6 +32,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { > [ASPEED_AST1700_DEV_SRAM] = 0x00BC0000, > [ASPEED_AST1700_DEV_ADC] = 0x00C00000, > [ASPEED_AST1700_DEV_SCU] = 0x00C02000, > + [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, > [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, > [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, > [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000, > @@ -98,6 +100,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, > Error **errp) > aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SCU], > sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->scu), 0)); > > + /* GPIO */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio), errp)) { > + return; > + } > + memory_region_add_subregion(&s->iomem, > + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_GPIO], > + sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0)); > + > /* LTPI controller */ > if (!sysbus_realize(SYS_BUS_DEVICE(&s->ltpi), errp)) { > return; > @@ -127,6 +137,10 @@ static void aspeed_ast1700_instance_init(Object *obj) > object_initialize_child(obj, "ioexp-scu[*]", &s->scu, > TYPE_ASPEED_2700_SCU); > > + /* GPIO */ > + object_initialize_child(obj, "ioexp-gpio[*]", &s->gpio, > + "aspeed.gpio-ast2700"); > + > /* LTPI controller */ > object_initialize_child(obj, "ltpi-ctrl", > &s->ltpi, TYPE_ASPEED_LTPI); > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c > index 6b9ad328dc..d998326536 100644 > --- a/hw/arm/aspeed_ast27x0.c > +++ b/hw/arm/aspeed_ast27x0.c > @@ -1124,6 +1124,10 @@ static void aspeed_soc_ast2700_realize(DeviceState > *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->ioexp[i].adc), 0, > aspeed_soc_ast2700_get_irq(s, ASPEED_DEV_ADC)); > > + /* GPIO */ > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ioexp[i].gpio), 0, > + aspeed_soc_ast2700_get_irq(s, ASPEED_DEV_GPIO)); > + > } > > aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu), > -- > 2.43.0 >
