Message ID | 20230114170151.87833-3-peter@pjd.dev (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw/nvram/eeprom_at24c: Cleanup + FRUID EEPROM init example | expand |
On 1/14/23 18:01, Peter Delevoryas wrote: > Signed-off-by: Peter Delevoryas <peter@pjd.dev> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/arm/aspeed.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 55f114ef729f..1f9799d4321e 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -17,6 +17,7 @@ > #include "hw/i2c/i2c_mux_pca954x.h" > #include "hw/i2c/smbus_eeprom.h" > #include "hw/misc/pca9552.h" > +#include "hw/nvram/eeprom_at24c.h" > #include "hw/sensor/tmp105.h" > #include "hw/misc/led.h" > #include "hw/qdev-properties.h" > @@ -429,15 +430,6 @@ static void aspeed_machine_init(MachineState *machine) > arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo); > } > > -static void at24c_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 palmetto_bmc_i2c_init(AspeedMachineState *bmc) > { > AspeedSoCState *soc = &bmc->soc;
On 14/1/23 18:01, Peter Delevoryas wrote: > Signed-off-by: Peter Delevoryas <peter@pjd.dev> > --- > hw/arm/aspeed.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > -static void at24c_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); > -} Why not squash in previous commit as 'extract helper' change? Anyhow, Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Mon, Jan 16, 2023 at 01:24:36PM +0100, Philippe Mathieu-Daudé wrote: > On 14/1/23 18:01, Peter Delevoryas wrote: > > Signed-off-by: Peter Delevoryas <peter@pjd.dev> > > --- > > hw/arm/aspeed.c | 10 +--------- > > 1 file changed, 1 insertion(+), 9 deletions(-) > > > -static void at24c_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); > > -} > > Why not squash in previous commit as 'extract helper' change? +1, I'll squash this. > > Anyhow, > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > >
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 55f114ef729f..1f9799d4321e 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -17,6 +17,7 @@ #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/misc/pca9552.h" +#include "hw/nvram/eeprom_at24c.h" #include "hw/sensor/tmp105.h" #include "hw/misc/led.h" #include "hw/qdev-properties.h" @@ -429,15 +430,6 @@ static void aspeed_machine_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo); } -static void at24c_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 palmetto_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc;
Signed-off-by: Peter Delevoryas <peter@pjd.dev> --- hw/arm/aspeed.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)