aspeed: add a GPIO controller to the SoC
Signed-off-by: Rashmica Gupta <rashmica.g@gmail.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-id: 20190904070506.1052-3-clg@kaod.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
4b7f956862
commit
fdcc7c0631
|
@ -125,6 +125,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
|
||||||
.spis_num = 1,
|
.spis_num = 1,
|
||||||
.fmc_typename = "aspeed.smc.fmc",
|
.fmc_typename = "aspeed.smc.fmc",
|
||||||
.spi_typename = aspeed_soc_ast2400_typenames,
|
.spi_typename = aspeed_soc_ast2400_typenames,
|
||||||
|
.gpio_typename = "aspeed.gpio-ast2400",
|
||||||
.wdts_num = 2,
|
.wdts_num = 2,
|
||||||
.irqmap = aspeed_soc_ast2400_irqmap,
|
.irqmap = aspeed_soc_ast2400_irqmap,
|
||||||
.memmap = aspeed_soc_ast2400_memmap,
|
.memmap = aspeed_soc_ast2400_memmap,
|
||||||
|
@ -137,6 +138,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
|
||||||
.spis_num = 1,
|
.spis_num = 1,
|
||||||
.fmc_typename = "aspeed.smc.fmc",
|
.fmc_typename = "aspeed.smc.fmc",
|
||||||
.spi_typename = aspeed_soc_ast2400_typenames,
|
.spi_typename = aspeed_soc_ast2400_typenames,
|
||||||
|
.gpio_typename = "aspeed.gpio-ast2400",
|
||||||
.wdts_num = 2,
|
.wdts_num = 2,
|
||||||
.irqmap = aspeed_soc_ast2400_irqmap,
|
.irqmap = aspeed_soc_ast2400_irqmap,
|
||||||
.memmap = aspeed_soc_ast2400_memmap,
|
.memmap = aspeed_soc_ast2400_memmap,
|
||||||
|
@ -149,6 +151,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
|
||||||
.spis_num = 1,
|
.spis_num = 1,
|
||||||
.fmc_typename = "aspeed.smc.fmc",
|
.fmc_typename = "aspeed.smc.fmc",
|
||||||
.spi_typename = aspeed_soc_ast2400_typenames,
|
.spi_typename = aspeed_soc_ast2400_typenames,
|
||||||
|
.gpio_typename = "aspeed.gpio-ast2400",
|
||||||
.wdts_num = 2,
|
.wdts_num = 2,
|
||||||
.irqmap = aspeed_soc_ast2400_irqmap,
|
.irqmap = aspeed_soc_ast2400_irqmap,
|
||||||
.memmap = aspeed_soc_ast2400_memmap,
|
.memmap = aspeed_soc_ast2400_memmap,
|
||||||
|
@ -161,6 +164,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
|
||||||
.spis_num = 2,
|
.spis_num = 2,
|
||||||
.fmc_typename = "aspeed.smc.ast2500-fmc",
|
.fmc_typename = "aspeed.smc.ast2500-fmc",
|
||||||
.spi_typename = aspeed_soc_ast2500_typenames,
|
.spi_typename = aspeed_soc_ast2500_typenames,
|
||||||
|
.gpio_typename = "aspeed.gpio-ast2500",
|
||||||
.wdts_num = 3,
|
.wdts_num = 3,
|
||||||
.irqmap = aspeed_soc_ast2500_irqmap,
|
.irqmap = aspeed_soc_ast2500_irqmap,
|
||||||
.memmap = aspeed_soc_ast2500_memmap,
|
.memmap = aspeed_soc_ast2500_memmap,
|
||||||
|
@ -247,6 +251,9 @@ static void aspeed_soc_init(Object *obj)
|
||||||
|
|
||||||
sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->xdma),
|
sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->xdma),
|
||||||
TYPE_ASPEED_XDMA);
|
TYPE_ASPEED_XDMA);
|
||||||
|
|
||||||
|
sysbus_init_child_obj(obj, "gpio", OBJECT(&s->gpio), sizeof(s->gpio),
|
||||||
|
sc->info->gpio_typename);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
||||||
|
@ -426,6 +433,16 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
||||||
sc->info->memmap[ASPEED_XDMA]);
|
sc->info->memmap[ASPEED_XDMA]);
|
||||||
sysbus_connect_irq(SYS_BUS_DEVICE(&s->xdma), 0,
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->xdma), 0,
|
||||||
aspeed_soc_get_irq(s, ASPEED_XDMA));
|
aspeed_soc_get_irq(s, ASPEED_XDMA));
|
||||||
|
|
||||||
|
/* GPIO */
|
||||||
|
object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);
|
||||||
|
if (err) {
|
||||||
|
error_propagate(errp, err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->info->memmap[ASPEED_GPIO]);
|
||||||
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0,
|
||||||
|
aspeed_soc_get_irq(s, ASPEED_GPIO));
|
||||||
}
|
}
|
||||||
static Property aspeed_soc_properties[] = {
|
static Property aspeed_soc_properties[] = {
|
||||||
DEFINE_PROP_UINT32("num-cpus", AspeedSoCState, num_cpus, 0),
|
DEFINE_PROP_UINT32("num-cpus", AspeedSoCState, num_cpus, 0),
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include "hw/watchdog/wdt_aspeed.h"
|
#include "hw/watchdog/wdt_aspeed.h"
|
||||||
#include "hw/net/ftgmac100.h"
|
#include "hw/net/ftgmac100.h"
|
||||||
#include "target/arm/cpu.h"
|
#include "target/arm/cpu.h"
|
||||||
|
#include "hw/gpio/aspeed_gpio.h"
|
||||||
|
|
||||||
#define ASPEED_SPIS_NUM 2
|
#define ASPEED_SPIS_NUM 2
|
||||||
#define ASPEED_WDTS_NUM 3
|
#define ASPEED_WDTS_NUM 3
|
||||||
|
@ -48,6 +49,7 @@ typedef struct AspeedSoCState {
|
||||||
AspeedSDMCState sdmc;
|
AspeedSDMCState sdmc;
|
||||||
AspeedWDTState wdt[ASPEED_WDTS_NUM];
|
AspeedWDTState wdt[ASPEED_WDTS_NUM];
|
||||||
FTGMAC100State ftgmac100[ASPEED_MACS_NUM];
|
FTGMAC100State ftgmac100[ASPEED_MACS_NUM];
|
||||||
|
AspeedGPIOState gpio;
|
||||||
} AspeedSoCState;
|
} AspeedSoCState;
|
||||||
|
|
||||||
#define TYPE_ASPEED_SOC "aspeed-soc"
|
#define TYPE_ASPEED_SOC "aspeed-soc"
|
||||||
|
@ -61,6 +63,7 @@ typedef struct AspeedSoCInfo {
|
||||||
int spis_num;
|
int spis_num;
|
||||||
const char *fmc_typename;
|
const char *fmc_typename;
|
||||||
const char **spi_typename;
|
const char **spi_typename;
|
||||||
|
const char *gpio_typename;
|
||||||
int wdts_num;
|
int wdts_num;
|
||||||
const int *irqmap;
|
const int *irqmap;
|
||||||
const hwaddr *memmap;
|
const hwaddr *memmap;
|
||||||
|
|
Loading…
Reference in a new issue