Re: [PATCH v5 7/9] hw/arm/aspeed: Describe each PCA9552 device

[Markus Armbruster]

Philippe Mathieu-Daudé  writes:

> 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
>
> Signed-off-by: Philippe Mathieu-Daudé 

Reviewed-by: Markus Armbruster 

Re: [PATCH v5 7/9] hw/arm/aspeed: Describe each PCA9552 device

[Cédric Le Goater]

On 6/22/20 8:34 PM, Philippe Mathieu-Daudé wrote:
> 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
> 
> Signed-off-by: Philippe Mathieu-Daudé 

Reviewed-by: Cédric Le Goater 

> ---
> Cc: Markus Armbruster 
> ---
>  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 6b7533aeee..3d5dec4692 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -508,12 +508,15 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState 
> *bmc)
>  {
>  AspeedSoCState *soc = >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(>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(>i2c), 3),
> +  _fatal);
>  
>  i2c_create_slave(aspeed_i2c_get_bus(DEVICE(>i2c), 4), "tmp423", 
> 0x4c);
>  i2c_create_slave(aspeed_i2c_get_bus(DEVICE(>i2c), 5), "tmp423", 
> 0x4c);
> @@ -528,8 +531,10 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState 
> *bmc)
>  
>  smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(>i2c), 11), 0x51,
>eeprom_buf);
> -i2c_create_slave(aspeed_i2c_get_bus(DEVICE(>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(>i2c), 11),
> +  _fatal);
>  /* Bus 11: TODO ucd90160@64 */
>  }
>  
> 

[PATCH v5 7/9] hw/arm/aspeed: Describe each PCA9552 device

[Philippe Mathieu-Daudé]

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

Signed-off-by: Philippe Mathieu-Daudé 
---
Cc: Markus Armbruster 
---
 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 6b7533aeee..3d5dec4692 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -508,12 +508,15 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState 
*bmc)
 {
 AspeedSoCState *soc = >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(>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(>i2c), 3),
+  _fatal);
 
 i2c_create_slave(aspeed_i2c_get_bus(DEVICE(>i2c), 4), "tmp423", 0x4c);
 i2c_create_slave(aspeed_i2c_get_bus(DEVICE(>i2c), 5), "tmp423", 0x4c);
@@ -528,8 +531,10 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)
 
 smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(>i2c), 11), 0x51,
   eeprom_buf);
-i2c_create_slave(aspeed_i2c_get_bus(DEVICE(>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(>i2c), 11),
+  _fatal);
 /* Bus 11: TODO ucd90160@64 */
 }
 
-- 
2.21.3