Re: [PATCH v2 2/4] hw/gpio: Add ASPEED GPIO model for AST1030

[Cédric Le Goater]

On 5/25/22 07:34, Jamin Lin wrote:
> AST1030 integrates one set of Parallel GPIO Controller
> with maximum 151 control pins, which are 21 groups
> (A~U, exclude pin: M6 M7 Q5 Q6 Q7 R0 R1 R4 R5 R6 R7 S0 S3 S4
> S5 S6 S7 ) and the group T and U are input only.
>
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.



> ---
>   hw/arm/aspeed_ast10x0.c | 11 +++++++++++
>   hw/gpio/aspeed_gpio.c   | 27 +++++++++++++++++++++++++++
>   2 files changed, 38 insertions(+)
>
> diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c
> index 4271549282..3a6b8122b6 100644
> --- a/hw/arm/aspeed_ast10x0.c
> +++ b/hw/arm/aspeed_ast10x0.c
> @@ -113,6 +113,9 @@ static void aspeed_soc_ast1030_init(Object *obj)
>           snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);
>           object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename);
>       }
> +
> +    snprintf(typename, sizeof(typename), "aspeed.gpio-%s", socname);
> +    object_initialize_child(obj, "gpio", &s->gpio, typename);
>   }
>   
>   static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp)
> @@ -260,6 +263,14 @@ static void aspeed_soc_ast1030_realize(DeviceState 
> *dev_soc, Error **errp)
>           sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0,
>                           sc->memmap[ASPEED_DEV_WDT] + i * awc->offset);
>       }
> +
> +    /* GPIO */
> +    if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio), errp)) {
> +        return;
> +    }
> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->memmap[ASPEED_DEV_GPIO]);
> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0,
> +                       aspeed_soc_get_irq(s, ASPEED_DEV_GPIO));
>   }
>   
>   static void aspeed_soc_ast1030_class_init(ObjectClass *klass, void *data)
> diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
> index 4620ea8e8b..5138fe812b 100644
> --- a/hw/gpio/aspeed_gpio.c
> +++ b/hw/gpio/aspeed_gpio.c
> @@ -819,6 +819,15 @@ static GPIOSetProperties 
> ast2600_1_8v_set_props[ASPEED_GPIO_MAX_NR_SETS] = {
>       [1] = {0x0000000f,  0x0000000f,  {"18E"} },
>   };
>   
> +static GPIOSetProperties ast1030_set_props[ASPEED_GPIO_MAX_NR_SETS] = {
> +    [0] = {0xffffffff,  0xffffffff,  {"A", "B", "C", "D"} },
> +    [1] = {0xffffffff,  0xffffffff,  {"E", "F", "G", "H"} },
> +    [2] = {0xffffffff,  0xffffffff,  {"I", "J", "K", "L"} },
> +    [3] = {0xffffff3f,  0xffffff3f,  {"M", "N", "O", "P"} },
> +    [4] = {0xff060c1f,  0x00060c1f,  {"Q", "R", "S", "T"} },
> +    [5] = {0x000000ff,  0x00000000,  {"U"} },
> +};
> +
>   static const MemoryRegionOps aspeed_gpio_ops = {
>       .read       = aspeed_gpio_read,
>       .write      = aspeed_gpio_write,
> @@ -971,6 +980,16 @@ static void 
> aspeed_gpio_ast2600_1_8v_class_init(ObjectClass *klass, void *data)
>       agc->reg_table = aspeed_1_8v_gpios;
>   }
>   
> +static void aspeed_gpio_1030_class_init(ObjectClass *klass, void *data)
> +{
> +    AspeedGPIOClass *agc = ASPEED_GPIO_CLASS(klass);
> +
> +    agc->props = ast1030_set_props;
> +    agc->nr_gpio_pins = 151;
> +    agc->nr_gpio_sets = 6;
> +    agc->reg_table = aspeed_3_3v_gpios;
> +}
> +
>   static const TypeInfo aspeed_gpio_info = {
>       .name           = TYPE_ASPEED_GPIO,
>       .parent         = TYPE_SYS_BUS_DEVICE,
> @@ -1008,6 +1027,13 @@ static const TypeInfo aspeed_gpio_ast2600_1_8v_info = {
>       .instance_init  = aspeed_gpio_init,
>   };
>   
> +static const TypeInfo aspeed_gpio_ast1030_info = {
> +    .name           = TYPE_ASPEED_GPIO "-ast1030",
> +    .parent         = TYPE_ASPEED_GPIO,
> +    .class_init     = aspeed_gpio_1030_class_init,
> +    .instance_init  = aspeed_gpio_init,
> +};
> +
>   static void aspeed_gpio_register_types(void)
>   {
>       type_register_static(&aspeed_gpio_info);
> @@ -1015,6 +1041,7 @@ static void aspeed_gpio_register_types(void)
>       type_register_static(&aspeed_gpio_ast2500_info);
>       type_register_static(&aspeed_gpio_ast2600_3_3v_info);
>       type_register_static(&aspeed_gpio_ast2600_1_8v_info);
> +    type_register_static(&aspeed_gpio_ast1030_info);
>   }
>   
>   type_init(aspeed_gpio_register_types);