[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 2/5] hw/arm/aspeed: Replace aspeed_eeprom_init with at24c_
From: |
Corey Minyard |
Subject: |
Re: [PATCH v4 2/5] hw/arm/aspeed: Replace aspeed_eeprom_init with at24c_eeprom_init |
Date: |
Wed, 25 Jan 2023 15:37:27 -0600 |
On Tue, Jan 17, 2023 at 06:42:11PM -0800, Peter Delevoryas wrote:
> aspeed_eeprom_init is an exact copy of at24c_eeprom_init, not needed.
Reviewed-by: Corey Minyard <cminyard@mvista.com>
>
> Signed-off-by: Peter Delevoryas <peter@pjd.dev>
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Joel Stanley <joel@jms.id.au>
> ---
> hw/arm/aspeed.c | 95 ++++++++++++++++++++++---------------------------
> 1 file changed, 43 insertions(+), 52 deletions(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 1f9799d4321e..c929c61d582a 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -660,15 +660,6 @@ static void g220a_bmc_i2c_init(AspeedMachineState *bmc)
> eeprom_buf);
> }
>
> -static void aspeed_eeprom_init(I2CBus *bus, uint8_t addr, uint32_t rsize)
> -{
> - I2CSlave *i2c_dev = i2c_slave_new("at24c-eeprom", addr);
> - DeviceState *dev = DEVICE(i2c_dev);
> -
> - qdev_prop_set_uint32(dev, "rom-size", rsize);
> - i2c_slave_realize_and_unref(i2c_dev, bus, &error_abort);
> -}
> -
> static void fp5280g2_bmc_i2c_init(AspeedMachineState *bmc)
> {
> AspeedSoCState *soc = &bmc->soc;
> @@ -701,7 +692,7 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)
> AspeedSoCState *soc = &bmc->soc;
> I2CSlave *i2c_mux;
>
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 0), 0x51, 32 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 0), 0x51, 32 * KiB);
>
> create_pca9552(soc, 3, 0x61);
>
> @@ -714,9 +705,9 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)
> 0x4a);
> i2c_mux = i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4),
> "pca9546", 0x70);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 2), 0x52, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 2), 0x52, 64 * KiB);
> create_pca9552(soc, 4, 0x60);
>
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 5), TYPE_TMP105,
> @@ -727,8 +718,8 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)
> create_pca9552(soc, 5, 0x61);
> i2c_mux = i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 5),
> "pca9546", 0x70);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
>
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), TYPE_TMP105,
> 0x48);
> @@ -738,10 +729,10 @@ static void rainier_bmc_i2c_init(AspeedMachineState
> *bmc)
> 0x4b);
> i2c_mux = i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6),
> "pca9546", 0x70);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 2), 0x50, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 3), 0x51, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 2), 0x50, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 3), 0x51, 64 * KiB);
>
> create_pca9552(soc, 7, 0x30);
> create_pca9552(soc, 7, 0x31);
> @@ -754,15 +745,15 @@ static void rainier_bmc_i2c_init(AspeedMachineState
> *bmc)
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), TYPE_TMP105,
> 0x48);
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "max31785",
> 0x52);
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 7), 0x50, 64 * KiB);
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 7), 0x51, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 7), 0x50, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 7), 0x51, 64 * KiB);
>
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), TYPE_TMP105,
> 0x48);
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), TYPE_TMP105,
> 0x4a);
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 8), 0x50, 64 * KiB);
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 8), 0x51, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 8), 0x50, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 8), 0x51, 64 * KiB);
> create_pca9552(soc, 8, 0x60);
> create_pca9552(soc, 8, 0x61);
> /* Bus 8: ucd90320@11 */
> @@ -771,11 +762,11 @@ static void rainier_bmc_i2c_init(AspeedMachineState
> *bmc)
>
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423",
> 0x4c);
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423",
> 0x4d);
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 9), 0x50, 128 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 9), 0x50, 128 * KiB);
>
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423",
> 0x4c);
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423",
> 0x4d);
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 10), 0x50, 128 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 10), 0x50, 128 * KiB);
>
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), TYPE_TMP105,
> 0x48);
> @@ -783,18 +774,18 @@ static void rainier_bmc_i2c_init(AspeedMachineState
> *bmc)
> 0x49);
> i2c_mux = i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11),
> "pca9546", 0x70);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> - aspeed_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 0), 0x50, 64 * KiB);
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x51, 64 * KiB);
> create_pca9552(soc, 11, 0x60);
>
>
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 13), 0x50, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 13), 0x50, 64 * KiB);
> create_pca9552(soc, 13, 0x60);
>
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 14), 0x50, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 14), 0x50, 64 * KiB);
> create_pca9552(soc, 14, 0x60);
>
> - aspeed_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 15), 0x50, 64 * KiB);
> + at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 15), 0x50, 64 * KiB);
> create_pca9552(soc, 15, 0x60);
> }
>
> @@ -838,45 +829,45 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
> i2c_slave_create_simple(i2c[17], TYPE_LM75, 0x4c);
> i2c_slave_create_simple(i2c[17], TYPE_LM75, 0x4d);
>
> - aspeed_eeprom_init(i2c[19], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[20], 0x50, 2 * KiB);
> - aspeed_eeprom_init(i2c[22], 0x52, 2 * KiB);
> + at24c_eeprom_init(i2c[19], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[20], 0x50, 2 * KiB);
> + at24c_eeprom_init(i2c[22], 0x52, 2 * KiB);
>
> i2c_slave_create_simple(i2c[3], TYPE_LM75, 0x48);
> i2c_slave_create_simple(i2c[3], TYPE_LM75, 0x49);
> i2c_slave_create_simple(i2c[3], TYPE_LM75, 0x4a);
> i2c_slave_create_simple(i2c[3], TYPE_TMP422, 0x4c);
>
> - aspeed_eeprom_init(i2c[8], 0x51, 64 * KiB);
> + at24c_eeprom_init(i2c[8], 0x51, 64 * KiB);
> i2c_slave_create_simple(i2c[8], TYPE_LM75, 0x4a);
>
> i2c_slave_create_simple(i2c[50], TYPE_LM75, 0x4c);
> - aspeed_eeprom_init(i2c[50], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[50], 0x52, 64 * KiB);
> i2c_slave_create_simple(i2c[51], TYPE_TMP75, 0x48);
> i2c_slave_create_simple(i2c[52], TYPE_TMP75, 0x49);
>
> i2c_slave_create_simple(i2c[59], TYPE_TMP75, 0x48);
> i2c_slave_create_simple(i2c[60], TYPE_TMP75, 0x49);
>
> - aspeed_eeprom_init(i2c[65], 0x53, 64 * KiB);
> + at24c_eeprom_init(i2c[65], 0x53, 64 * KiB);
> i2c_slave_create_simple(i2c[66], TYPE_TMP75, 0x49);
> i2c_slave_create_simple(i2c[66], TYPE_TMP75, 0x48);
> - aspeed_eeprom_init(i2c[68], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[69], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[70], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[71], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[68], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[69], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[70], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[71], 0x52, 64 * KiB);
>
> - aspeed_eeprom_init(i2c[73], 0x53, 64 * KiB);
> + at24c_eeprom_init(i2c[73], 0x53, 64 * KiB);
> i2c_slave_create_simple(i2c[74], TYPE_TMP75, 0x49);
> i2c_slave_create_simple(i2c[74], TYPE_TMP75, 0x48);
> - aspeed_eeprom_init(i2c[76], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[77], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[78], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[79], 0x52, 64 * KiB);
> - aspeed_eeprom_init(i2c[28], 0x50, 2 * KiB);
> + at24c_eeprom_init(i2c[76], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[77], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[78], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[79], 0x52, 64 * KiB);
> + at24c_eeprom_init(i2c[28], 0x50, 2 * KiB);
>
> for (int i = 0; i < 8; i++) {
> - aspeed_eeprom_init(i2c[81 + i * 8], 0x56, 64 * KiB);
> + at24c_eeprom_init(i2c[81 + i * 8], 0x56, 64 * KiB);
> i2c_slave_create_simple(i2c[82 + i * 8], TYPE_TMP75, 0x48);
> i2c_slave_create_simple(i2c[83 + i * 8], TYPE_TMP75, 0x4b);
> i2c_slave_create_simple(i2c[84 + i * 8], TYPE_TMP75, 0x4a);
> @@ -947,11 +938,11 @@ static void fby35_i2c_init(AspeedMachineState *bmc)
> i2c_slave_create_simple(i2c[12], TYPE_LM75, 0x4e);
> i2c_slave_create_simple(i2c[12], TYPE_LM75, 0x4f);
>
> - aspeed_eeprom_init(i2c[4], 0x51, 128 * KiB);
> - aspeed_eeprom_init(i2c[6], 0x51, 128 * KiB);
> - aspeed_eeprom_init(i2c[8], 0x50, 32 * KiB);
> - aspeed_eeprom_init(i2c[11], 0x51, 128 * KiB);
> - aspeed_eeprom_init(i2c[11], 0x54, 128 * KiB);
> + at24c_eeprom_init(i2c[4], 0x51, 128 * KiB);
> + at24c_eeprom_init(i2c[6], 0x51, 128 * KiB);
> + at24c_eeprom_init(i2c[8], 0x50, 32 * KiB);
> + at24c_eeprom_init(i2c[11], 0x51, 128 * KiB);
> + at24c_eeprom_init(i2c[11], 0x54, 128 * KiB);
>
> /*
> * TODO: There is a multi-master i2c connection to an AST1030 MiniBMC on
> --
> 2.39.0
>
>
- [PATCH v4 0/5] hw/nvram/eeprom_at24c: Cleanup + FRUID EEPROM init example, Peter Delevoryas, 2023/01/17
- [PATCH v4 1/5] hw/arm: Extract at24c_eeprom_init helper from Aspeed and Nuvoton boards, Peter Delevoryas, 2023/01/17
- [PATCH v4 2/5] hw/arm/aspeed: Replace aspeed_eeprom_init with at24c_eeprom_init, Peter Delevoryas, 2023/01/17
- Re: [PATCH v4 2/5] hw/arm/aspeed: Replace aspeed_eeprom_init with at24c_eeprom_init,
Corey Minyard <=
- [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Peter Delevoryas, 2023/01/17
- Re: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Cédric Le Goater, 2023/01/18
- Re: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Ninad S Palsule, 2023/01/25
- Re: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Peter Delevoryas, 2023/01/25
- Re: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Cédric Le Goater, 2023/01/26
- RE: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Ninad S Palsule, 2023/01/26
- Re: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Cédric Le Goater, 2023/01/26
- RE: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Ninad S Palsule, 2023/01/26
Re: [PATCH v4 3/5] hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper, Corey Minyard, 2023/01/25