Re: [PATCH v1 2/2] aspeed: Add I2C buses to AST1030 model

[Cédric Le Goater]

On 3/24/22 11:04, Troy Lee wrote:
> Instanitate the I2C buses in AST1030 model and create two slave device
> for ast1030-evb.
>
> Signed-off-by: Troy Lee <troy_lee@aspeedtech.com>
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> Signed-off-by: Steven Lee <steven_lee@aspeedtech.com>

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

Thanks,

C.


> ---
>   hw/arm/aspeed_ast1030.c | 17 +++++++++++++++++
>   hw/arm/aspeed_minibmc.c | 13 +++++++++++++
>   2 files changed, 30 insertions(+)
>
> diff --git a/hw/arm/aspeed_ast1030.c b/hw/arm/aspeed_ast1030.c
> index fe700d922f..c16bcba7c9 100644
> --- a/hw/arm/aspeed_ast1030.c
> +++ b/hw/arm/aspeed_ast1030.c
> @@ -92,6 +92,9 @@ static void aspeed_soc_ast1030_init(Object *obj)
>       object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), "hw-strap1");
>       object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), "hw-strap2");
>   
> +    snprintf(typename, sizeof(typename), "aspeed.i2c-%s", socname);
> +    object_initialize_child(obj, "i2c", &s->i2c, typename);
> +
>       snprintf(typename, sizeof(typename), "aspeed.timer-%s", socname);
>       object_initialize_child(obj, "timerctrl", &s->timerctrl, typename);
>   
> @@ -163,6 +166,20 @@ static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp)
>       }
>       sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]);
>   
> +    /* I2C */
> +    object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(&s->sram),
> +                             &error_abort);
> +    if (!sysbus_realize(SYS_BUS_DEVICE(&s->i2c), errp)) {
> +        return;
> +    }
> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_DEV_I2C]);
> +    for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) {
> +        qemu_irq irq = qdev_get_gpio_in(DEVICE(&s->armv7m),
> +                                        sc->irqmap[ASPEED_DEV_I2C] + i);
> +        /* The AST2600 I2C controller has one IRQ per bus. */
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0, irq);
> +    }
> +
>       /* LPC */
>       if (!sysbus_realize(SYS_BUS_DEVICE(&s->lpc), errp)) {
>           return;
> diff --git a/hw/arm/aspeed_minibmc.c b/hw/arm/aspeed_minibmc.c
> index 6a29475919..764df92f65 100644
> --- a/hw/arm/aspeed_minibmc.c
> +++ b/hw/arm/aspeed_minibmc.c
> @@ -37,6 +37,18 @@ struct AspeedMiniBmcMachineState {
>   /* Main SYSCLK frequency in Hz (200MHz) */
>   #define SYSCLK_FRQ 200000000ULL
>   
> +static void ast1030_evb_i2c_init(AspeedMiniBmcMachineState *bmc)
> +{
> +    AspeedSoCState *soc = &bmc->soc;
> +
> +    /* U10 24C08 connects to SDA/SCL Groupt 1 by default */
> +    uint8_t *eeprom_buf = g_malloc0(32 * 1024);
> +    smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 0), 0x50, eeprom_buf);
> +
> +    /* U11 LM75 connects to SDA/SCL Group 2 by default */
> +    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 1), "tmp105", 0x4d);
> +}
> +
>   static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc,
>                                                             void *data)
>   {
> @@ -47,6 +59,7 @@ static void 
> aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc,
>       amc->soc_name = "ast1030-a1";
>       amc->hw_strap1 = 0;
>       amc->hw_strap2 = 0;
> +    amc->i2c_init = ast1030_evb_i2c_init;
>       mc->default_ram_size = 0;
>       mc->default_cpus = mc->min_cpus = mc->max_cpus = 1;
>       amc->fmc_model = "sst25vf032b";