Commit 044475f3 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string 



Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190412165416.7977-2-philmd@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 597e76f2

hw/arm/aspeed.c

+9 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include "hw/arm/aspeed_soc.h"

#include "hw/boards.h"

#include "hw/i2c/smbus_eeprom.h"

#include "hw/misc/pca9552.h"

#include "hw/misc/tmp105.h"

#include "qemu/log.h"

#include "sysemu/block-backend.h"

#include "hw/loader.h"
@@ -267,7 +269,8 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc) 
                          eeprom_buf);



    /* The AST2500 EVB expects a LM75 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), "tmp105", 0x4d);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7),

                     TYPE_TMP105, 0x4d);



    /* The AST2500 EVB does not have an RTC. Let's pretend that one is

     * plugged on the I2C bus header */
@@ -288,13 +291,15 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) 
    AspeedSoCState *soc = &bmc->soc;

    uint8_t *eeprom_buf = g_malloc0(8 * 1024);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), "pca9552", 0x60);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), TYPE_PCA9552,

                     0x60);



    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);



    /* The Witherspoon expects a TMP275 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "tmp105", 0x4a);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), TYPE_TMP105,

                     0x4a);



    /* The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is

     * good enough */
@@ -302,7 +307,7 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *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), "pca9552",

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), TYPE_PCA9552,

                     0x60);

}