hw/arm: Extract at24c_eeprom_init helper from Aspeed and Nuvoton boards
This helper is useful in board initialization because lets users initialize and realize an EEPROM on an I2C bus with a single function call. Signed-off-by: Peter Delevoryas <peter@pjd.dev> Reviewed-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Corey Minyard <cminyard@mvista.com> Link: https://lore.kernel.org/r/20230128060543.95582-2-peter@pjd.dev Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
parent
ddbf7bd73c
commit
9618ebae45
|
@ -17,6 +17,7 @@
|
||||||
#include "hw/i2c/i2c_mux_pca954x.h"
|
#include "hw/i2c/i2c_mux_pca954x.h"
|
||||||
#include "hw/i2c/smbus_eeprom.h"
|
#include "hw/i2c/smbus_eeprom.h"
|
||||||
#include "hw/misc/pca9552.h"
|
#include "hw/misc/pca9552.h"
|
||||||
|
#include "hw/nvram/eeprom_at24c.h"
|
||||||
#include "hw/sensor/tmp105.h"
|
#include "hw/sensor/tmp105.h"
|
||||||
#include "hw/misc/led.h"
|
#include "hw/misc/led.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
|
@ -439,15 +440,6 @@ static void aspeed_machine_init(MachineState *machine)
|
||||||
arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo);
|
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)
|
static void palmetto_bmc_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "hw/i2c/i2c_mux_pca954x.h"
|
#include "hw/i2c/i2c_mux_pca954x.h"
|
||||||
#include "hw/i2c/smbus_eeprom.h"
|
#include "hw/i2c/smbus_eeprom.h"
|
||||||
#include "hw/loader.h"
|
#include "hw/loader.h"
|
||||||
|
#include "hw/nvram/eeprom_at24c.h"
|
||||||
#include "hw/qdev-core.h"
|
#include "hw/qdev-core.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
|
@ -140,17 +141,6 @@ static I2CBus *npcm7xx_i2c_get_bus(NPCM7xxState *soc, uint32_t num)
|
||||||
return I2C_BUS(qdev_get_child_bus(DEVICE(&soc->smbus[num]), "i2c-bus"));
|
return I2C_BUS(qdev_get_child_bus(DEVICE(&soc->smbus[num]), "i2c-bus"));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void at24c_eeprom_init(NPCM7xxState *soc, int bus, uint8_t addr,
|
|
||||||
uint32_t rsize)
|
|
||||||
{
|
|
||||||
I2CBus *i2c_bus = npcm7xx_i2c_get_bus(soc, bus);
|
|
||||||
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, i2c_bus, &error_abort);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void npcm7xx_init_pwm_splitter(NPCM7xxMachine *machine,
|
static void npcm7xx_init_pwm_splitter(NPCM7xxMachine *machine,
|
||||||
NPCM7xxState *soc, const int *fan_counts)
|
NPCM7xxState *soc, const int *fan_counts)
|
||||||
{
|
{
|
||||||
|
@ -253,8 +243,8 @@ static void quanta_gsj_i2c_init(NPCM7xxState *soc)
|
||||||
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 3), "tmp105", 0x5c);
|
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 3), "tmp105", 0x5c);
|
||||||
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 4), "tmp105", 0x5c);
|
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 4), "tmp105", 0x5c);
|
||||||
|
|
||||||
at24c_eeprom_init(soc, 9, 0x55, 8192);
|
at24c_eeprom_init(npcm7xx_i2c_get_bus(soc, 9), 0x55, 8192);
|
||||||
at24c_eeprom_init(soc, 10, 0x55, 8192);
|
at24c_eeprom_init(npcm7xx_i2c_get_bus(soc, 10), 0x55, 8192);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* i2c-11:
|
* i2c-11:
|
||||||
|
@ -360,7 +350,7 @@ static void kudo_bmc_i2c_init(NPCM7xxState *soc)
|
||||||
|
|
||||||
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 4), TYPE_PCA9548, 0x77);
|
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 4), TYPE_PCA9548, 0x77);
|
||||||
|
|
||||||
at24c_eeprom_init(soc, 4, 0x50, 8192); /* mbfru */
|
at24c_eeprom_init(npcm7xx_i2c_get_bus(soc, 4), 0x50, 8192); /* mbfru */
|
||||||
|
|
||||||
i2c_mux = i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 13),
|
i2c_mux = i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 13),
|
||||||
TYPE_PCA9548, 0x77);
|
TYPE_PCA9548, 0x77);
|
||||||
|
@ -371,7 +361,7 @@ static void kudo_bmc_i2c_init(NPCM7xxState *soc)
|
||||||
i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 4), "tmp105", 0x48);
|
i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 4), "tmp105", 0x48);
|
||||||
i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 5), "tmp105", 0x49);
|
i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 5), "tmp105", 0x49);
|
||||||
|
|
||||||
at24c_eeprom_init(soc, 14, 0x55, 8192); /* bmcfru */
|
at24c_eeprom_init(npcm7xx_i2c_get_bus(soc, 14), 0x55, 8192); /* bmcfru */
|
||||||
|
|
||||||
/* TODO: Add remaining i2c devices. */
|
/* TODO: Add remaining i2c devices. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/i2c.h"
|
||||||
|
#include "hw/nvram/eeprom_at24c.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "hw/qdev-properties-system.h"
|
#include "hw/qdev-properties-system.h"
|
||||||
#include "sysemu/block-backend.h"
|
#include "sysemu/block-backend.h"
|
||||||
|
@ -128,6 +129,17 @@ int at24c_eeprom_send(I2CSlave *s, uint8_t data)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
I2CSlave *at24c_eeprom_init(I2CBus *bus, uint8_t address, uint32_t rom_size)
|
||||||
|
{
|
||||||
|
I2CSlave *i2c_dev = i2c_slave_new(TYPE_AT24C_EE, address);
|
||||||
|
DeviceState *dev = DEVICE(i2c_dev);
|
||||||
|
|
||||||
|
qdev_prop_set_uint32(dev, "rom-size", rom_size);
|
||||||
|
i2c_slave_realize_and_unref(i2c_dev, bus, &error_abort);
|
||||||
|
|
||||||
|
return i2c_dev;
|
||||||
|
}
|
||||||
|
|
||||||
static void at24c_eeprom_realize(DeviceState *dev, Error **errp)
|
static void at24c_eeprom_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
EEPROMState *ee = AT24C_EE(dev);
|
EEPROMState *ee = AT24C_EE(dev);
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef EEPROM_AT24C_H
|
||||||
|
#define EEPROM_AT24C_H
|
||||||
|
|
||||||
|
#include "hw/i2c/i2c.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Create and realize an AT24C EEPROM device on the heap.
|
||||||
|
* @bus: I2C bus to put it on
|
||||||
|
* @address: I2C address of the EEPROM slave when put on a bus
|
||||||
|
* @rom_size: size of the EEPROM
|
||||||
|
*
|
||||||
|
* Create the device state structure, initialize it, put it on the specified
|
||||||
|
* @bus, and drop the reference to it (the device is realized).
|
||||||
|
*/
|
||||||
|
I2CSlave *at24c_eeprom_init(I2CBus *bus, uint8_t address, uint32_t rom_size);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue