[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 2/3] aspeed: add a GPIO controller to the SoC
From: |
Cédric Le Goater |
Subject: |
Re: [Qemu-devel] [PATCH v4 2/3] aspeed: add a GPIO controller to the SoC |
Date: |
Wed, 14 Aug 2019 14:30:42 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 |
On 14/08/2019 09:14, Rashmica Gupta wrote:
> Signed-off-by: Rashmica Gupta <address@hidden>
> ---
> hw/arm/aspeed_soc.c | 17 +++++++++++++++++
> include/hw/arm/aspeed_soc.h | 3 +++
> 2 files changed, 20 insertions(+)
>
> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
> index c6fb3700f2..ff422c8ad1 100644
> --- a/hw/arm/aspeed_soc.c
> +++ b/hw/arm/aspeed_soc.c
> @@ -124,6 +124,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spis_num = 1,
> .fmc_typename = "aspeed.smc.fmc",
> .spi_typename = aspeed_soc_ast2400_typenames,
> + .gpio_typename = "aspeed.gpio-ast2400",
I suppose this patch is based on mainline and not my tree.
My current patchset has removed all these typenames but that's OK.
It's a minor change we can handle depending on which patch gets
merged first.
A part from that, it looks good.
Thanks,
C.
> .wdts_num = 2,
> .irqmap = aspeed_soc_ast2400_irqmap,
> .memmap = aspeed_soc_ast2400_memmap,
> @@ -136,6 +137,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spis_num = 1,
> .fmc_typename = "aspeed.smc.fmc",
> .spi_typename = aspeed_soc_ast2400_typenames,
> + .gpio_typename = "aspeed.gpio-ast2400",
> .wdts_num = 2,
> .irqmap = aspeed_soc_ast2400_irqmap,
> .memmap = aspeed_soc_ast2400_memmap,
> @@ -148,6 +150,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spis_num = 1,
> .fmc_typename = "aspeed.smc.fmc",
> .spi_typename = aspeed_soc_ast2400_typenames,
> + .gpio_typename = "aspeed.gpio-ast2400",
> .wdts_num = 2,
> .irqmap = aspeed_soc_ast2400_irqmap,
> .memmap = aspeed_soc_ast2400_memmap,
> @@ -160,6 +163,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spis_num = 2,
> .fmc_typename = "aspeed.smc.ast2500-fmc",
> .spi_typename = aspeed_soc_ast2500_typenames,
> + .gpio_typename = "aspeed.gpio-ast2500",
> .wdts_num = 3,
> .irqmap = aspeed_soc_ast2500_irqmap,
> .memmap = aspeed_soc_ast2500_memmap,
> @@ -246,6 +250,9 @@ static void aspeed_soc_init(Object *obj)
>
> sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->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)
> @@ -425,6 +432,16 @@ static void aspeed_soc_realize(DeviceState *dev, Error
> **errp)
> sc->info->memmap[ASPEED_XDMA]);
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->xdma), 0,
> 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[] = {
> DEFINE_PROP_UINT32("num-cpus", AspeedSoCState, num_cpus, 0),
> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> index cef605ad6b..fa04abddd8 100644
> --- a/include/hw/arm/aspeed_soc.h
> +++ b/include/hw/arm/aspeed_soc.h
> @@ -22,6 +22,7 @@
> #include "hw/ssi/aspeed_smc.h"
> #include "hw/watchdog/wdt_aspeed.h"
> #include "hw/net/ftgmac100.h"
> +#include "hw/gpio/aspeed_gpio.h"
>
> #define ASPEED_SPIS_NUM 2
> #define ASPEED_WDTS_NUM 3
> @@ -47,6 +48,7 @@ typedef struct AspeedSoCState {
> AspeedSDMCState sdmc;
> AspeedWDTState wdt[ASPEED_WDTS_NUM];
> FTGMAC100State ftgmac100[ASPEED_MACS_NUM];
> + AspeedGPIOState gpio;
> } AspeedSoCState;
>
> #define TYPE_ASPEED_SOC "aspeed-soc"
> @@ -60,6 +62,7 @@ typedef struct AspeedSoCInfo {
> int spis_num;
> const char *fmc_typename;
> const char **spi_typename;
> + const char *gpio_typename;
> int wdts_num;
> const int *irqmap;
> const hwaddr *memmap;
>