hw/arm/aspeed: Rename AspeedBoardState as AspeedMachineState
To have a more consistent naming, rename AspeedBoardState as AspeedMachineState. Suggested-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Message-id: 20200623072132.2868-3-f4bug@amsat.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
f489960d36
commit
612b219a2a
|
@ -32,7 +32,7 @@ static struct arm_boot_info aspeed_board_binfo = {
|
||||||
.board_id = -1, /* device-tree-only board */
|
.board_id = -1, /* device-tree-only board */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AspeedBoardState {
|
struct AspeedMachineState {
|
||||||
AspeedSoCState soc;
|
AspeedSoCState soc;
|
||||||
MemoryRegion ram_container;
|
MemoryRegion ram_container;
|
||||||
MemoryRegion max_ram;
|
MemoryRegion max_ram;
|
||||||
|
@ -253,7 +253,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)
|
||||||
|
|
||||||
static void aspeed_machine_init(MachineState *machine)
|
static void aspeed_machine_init(MachineState *machine)
|
||||||
{
|
{
|
||||||
AspeedBoardState *bmc;
|
AspeedMachineState *bmc;
|
||||||
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
|
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
|
||||||
AspeedSoCClass *sc;
|
AspeedSoCClass *sc;
|
||||||
DriveInfo *drive0 = drive_get(IF_MTD, 0, 0);
|
DriveInfo *drive0 = drive_get(IF_MTD, 0, 0);
|
||||||
|
@ -261,7 +261,7 @@ static void aspeed_machine_init(MachineState *machine)
|
||||||
int i;
|
int i;
|
||||||
NICInfo *nd = &nd_table[0];
|
NICInfo *nd = &nd_table[0];
|
||||||
|
|
||||||
bmc = g_new0(AspeedBoardState, 1);
|
bmc = g_new0(AspeedMachineState, 1);
|
||||||
|
|
||||||
memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container",
|
memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container",
|
||||||
4 * GiB);
|
4 * GiB);
|
||||||
|
@ -374,7 +374,7 @@ 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 palmetto_bmc_i2c_init(AspeedBoardState *bmc)
|
static void palmetto_bmc_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
@ -396,7 +396,7 @@ static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)
|
||||||
object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_abort);
|
object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_abort);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ast2500_evb_i2c_init(AspeedBoardState *bmc)
|
static void ast2500_evb_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
uint8_t *eeprom_buf = g_malloc0(8 * 1024);
|
uint8_t *eeprom_buf = g_malloc0(8 * 1024);
|
||||||
|
@ -413,13 +413,13 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)
|
||||||
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);
|
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ast2600_evb_i2c_init(AspeedBoardState *bmc)
|
static void ast2600_evb_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
/* Start with some devices on our I2C busses */
|
/* Start with some devices on our I2C busses */
|
||||||
ast2500_evb_i2c_init(bmc);
|
ast2500_evb_i2c_init(bmc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void romulus_bmc_i2c_init(AspeedBoardState *bmc)
|
static void romulus_bmc_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
|
|
||||||
|
@ -428,7 +428,7 @@ static void romulus_bmc_i2c_init(AspeedBoardState *bmc)
|
||||||
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);
|
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void swift_bmc_i2c_init(AspeedBoardState *bmc)
|
static void swift_bmc_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
|
|
||||||
|
@ -457,7 +457,7 @@ static void swift_bmc_i2c_init(AspeedBoardState *bmc)
|
||||||
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x4a);
|
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x4a);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc)
|
static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
|
|
||||||
|
@ -501,7 +501,7 @@ static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)
|
static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)
|
||||||
{
|
{
|
||||||
AspeedSoCState *soc = &bmc->soc;
|
AspeedSoCState *soc = &bmc->soc;
|
||||||
uint8_t *eeprom_buf = g_malloc0(8 * 1024);
|
uint8_t *eeprom_buf = g_malloc0(8 * 1024);
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
|
|
||||||
typedef struct AspeedBoardState AspeedBoardState;
|
typedef struct AspeedMachineState AspeedMachineState;
|
||||||
|
|
||||||
#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")
|
#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")
|
||||||
#define ASPEED_MACHINE(obj) \
|
#define ASPEED_MACHINE(obj) \
|
||||||
|
@ -45,7 +45,7 @@ typedef struct AspeedMachineClass {
|
||||||
const char *spi_model;
|
const char *spi_model;
|
||||||
uint32_t num_cs;
|
uint32_t num_cs;
|
||||||
uint32_t macs_mask;
|
uint32_t macs_mask;
|
||||||
void (*i2c_init)(AspeedBoardState *bmc);
|
void (*i2c_init)(AspeedMachineState *bmc);
|
||||||
} AspeedMachineClass;
|
} AspeedMachineClass;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue