[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 7/9] hw/arm/aspeed: Describe each PCA9552 device
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v6 7/9] hw/arm/aspeed: Describe each PCA9552 device |
Date: |
Tue, 23 Jun 2020 09:27:21 +0200 |
We have 2 distinct PCA9552 devices. Set their description
to distinguish them when looking at the trace events.
Description name taken from:
https://github.com/open-power/witherspoon-xml/blob/master/witherspoon.xml
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Corey Minyard <cminyard@mvista.com>
---
hw/arm/aspeed.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index ccf127b328..307dba5065 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -508,12 +508,15 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState
*bmc)
{
AspeedSoCState *soc = &bmc->soc;
uint8_t *eeprom_buf = g_malloc0(8 * 1024);
+ DeviceState *dev;
/* Bus 3: TODO bmp280@77 */
/* Bus 3: TODO max31785@52 */
/* Bus 3: TODO dps310@76 */
- i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), TYPE_PCA9552,
- 0x60);
+ dev = i2c_try_create_slave(TYPE_PCA9552, 0x60);
+ qdev_prop_set_string(dev, "description", "pca1");
+ i2c_realize_and_unref(dev, aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3),
+ &error_fatal);
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "tmp423", 0x4c);
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 5), "tmp423", 0x4c);
@@ -528,8 +531,10 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState
*bmc)
smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), 0x51,
eeprom_buf);
- i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), TYPE_PCA9552,
- 0x60);
+ dev = i2c_try_create_slave(TYPE_PCA9552, 0x60);
+ qdev_prop_set_string(dev, "description", "pca0");
+ i2c_realize_and_unref(dev, aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11),
+ &error_fatal);
/* Bus 11: TODO ucd90160@64 */
}
--
2.21.3
- [PATCH v6 0/9] hw/misc/pca9552: Trace GPIO change events, Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 1/9] hw/i2c/core: Add i2c_try_create_slave() and i2c_realize_and_unref(), Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 2/9] hw/misc/pca9552: Rename 'nr_leds' as 'pin_count', Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 3/9] hw/misc/pca9552: Rename generic code as pca955x, Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 4/9] hw/misc/pca9552: Add generic PCA955xClass, parent of TYPE_PCA9552, Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 5/9] hw/misc/pca9552: Add a 'description' property for debugging purpose, Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 7/9] hw/arm/aspeed: Describe each PCA9552 device,
Philippe Mathieu-Daudé <=
- [PATCH v6 6/9] hw/misc/pca9552: Trace GPIO High/Low events, Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 8/9] hw/misc/pca9552: Trace GPIO change events, Philippe Mathieu-Daudé, 2020/06/23
- [PATCH v6 9/9] hw/misc/pca9552: Model qdev output GPIOs, Philippe Mathieu-Daudé, 2020/06/23
- Re: [PATCH v6 0/9] hw/misc/pca9552: Trace GPIO change events, Cédric Le Goater, 2020/06/23