Commit 873ec69a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cminyard/tags/for-qemu-i2c-5' into staging 



Minor changes to:

Add an SMBus config entry

Cleanup/simplify/document some I2C interfaces

# gpg: Signature made Thu 16 Jul 2020 18:46:55 BST
# gpg:                using RSA key FD0D5CE67CE0F59A6688268661F38C90919BFF81
# gpg: Good signature from "Corey Minyard <cminyard@mvista.com>" [unknown]
# gpg:                 aka "Corey Minyard <minyard@acm.org>" [unknown]
# gpg:                 aka "Corey Minyard <corey@minyard.net>" [unknown]
# gpg:                 aka "Corey Minyard <minyard@mvista.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FD0D 5CE6 7CE0 F59A 6688  2686 61F3 8C90 919B FF81

* remotes/cminyard/tags/for-qemu-i2c-5:
  hw/i2c: Document the I2C qdev helpers
  hw/i2c: Rename i2c_create_slave() as i2c_slave_create_simple()
  hw/i2c: Rename i2c_realize_and_unref() as i2c_slave_realize_and_unref()
  hw/i2c: Rename i2c_try_create_slave() as i2c_slave_new()
  hw/i2c/aspeed_i2c: Simplify aspeed_i2c_get_bus()
  hw/i2c/Kconfig: Add an entry for the SMBus

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d69cda7e 73d5f22e

hw/arm/aspeed.c

+42 −40
Original line number Diff line number Diff line
@@ -386,14 +386,14 @@ static void palmetto_bmc_i2c_init(AspeedMachineState *bmc) 


    /* The palmetto platform expects a ds3231 RTC but a ds1338 is

     * enough to provide basic RTC features. Alarms will be missing */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 0), "ds1338", 0x68);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 0), "ds1338", 0x68);



    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 0), 0x50,

    smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 0), 0x50,

                          eeprom_buf);



    /* add a TMP423 temperature sensor */

    dev = i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2),

                           "tmp423", 0x4c);

    dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2),

                                         "tmp423", 0x4c));

    object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort);

    object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort);

    object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort);
@@ -405,16 +405,16 @@ static void ast2500_evb_i2c_init(AspeedMachineState *bmc) 
    AspeedSoCState *soc = &bmc->soc;

    uint8_t *eeprom_buf = g_malloc0(8 * 1024);



    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), 0x50,

    smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 3), 0x50,

                          eeprom_buf);



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

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

    i2c_slave_create_simple(aspeed_i2c_get_bus(&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 */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);

}



static void ast2600_evb_i2c_init(AspeedMachineState *bmc)
@@ -429,36 +429,36 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc) 


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

     * good enough */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);

}



static void swift_bmc_i2c_init(AspeedMachineState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;



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

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



    /* The swift board expects a TMP275 but a TMP105 is compatible */

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

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48);

    /* The swift board expects a pca9551 but a pca9552 is compatible */

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

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60);



    /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "ds1338", 0x32);

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

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "tmp423", 0x4c);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c);

    /* The swift board expects a pca9539 but a pca9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "pca9552", 0x74);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 10), "tmp423", 0x4c);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c);

    /* The swift board expects a pca9539 but a pca9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 10), "pca9552",

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552",

                     0x74);



    /* The swift board expects a TMP275 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x48);

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

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a);

}



static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
@@ -466,32 +466,32 @@ static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) 
    AspeedSoCState *soc = &bmc->soc;



    /* bus 2 : */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2), "tmp105", 0x48);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2), "tmp105", 0x49);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x48);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x49);

    /* bus 2 : pca9546 @ 0x73 */



    /* bus 3 : pca9548 @ 0x70 */



    /* bus 4 : */

    uint8_t *eeprom4_54 = g_malloc0(8 * 1024);

    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), 0x54,

    smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 4), 0x54,

                          eeprom4_54);

    /* PCA9539 @ 0x76, but PCA9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "pca9552", 0x76);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "pca9552", 0x76);

    /* PCA9539 @ 0x77, but PCA9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "pca9552", 0x77);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "pca9552", 0x77);



    /* bus 6 : */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x48);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x49);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x48);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x49);

    /* bus 6 : pca9546 @ 0x73 */



    /* bus 8 : */

    uint8_t *eeprom8_56 = g_malloc0(8 * 1024);

    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), 0x56,

    smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 8), 0x56,

                          eeprom8_56);

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

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "pca9552", 0x61);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x61);

    /* bus 8 : adc128d818 @ 0x1d */

    /* bus 8 : adc128d818 @ 0x1f */
@@ -514,27 +514,29 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc) 
    /* Bus 3: TODO bmp280@77 */

    /* Bus 3: TODO max31785@52 */

    /* Bus 3: TODO dps310@76 */

    dev = i2c_try_create_slave(TYPE_PCA9552, 0x60);

    dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));

    qdev_prop_set_string(dev, "description", "pca1");

    i2c_realize_and_unref(dev, aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3),

    i2c_slave_realize_and_unref(I2C_SLAVE(dev),

                                aspeed_i2c_get_bus(&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);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "tmp423", 0x4c);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&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), TYPE_TMP105,

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), TYPE_TMP105,

                     0x4a);



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

     * good enough */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);

    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);



    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), 0x51,

    smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 11), 0x51,

                          eeprom_buf);

    dev = i2c_try_create_slave(TYPE_PCA9552, 0x60);

    dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));

    qdev_prop_set_string(dev, "description", "pca0");

    i2c_realize_and_unref(dev, aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11),

    i2c_slave_realize_and_unref(I2C_SLAVE(dev),

                                aspeed_i2c_get_bus(&soc->i2c, 11),

                                &error_fatal);

    /* Bus 11: TODO ucd90160@64 */

}

hw/arm/musicpal.c

+2 −2
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ static void musicpal_init(MachineState *machine) 
    DeviceState *i2c_dev;

    DeviceState *lcd_dev;

    DeviceState *key_dev;

    DeviceState *wm8750_dev;

    I2CSlave *wm8750_dev;

    SysBusDevice *s;

    I2CBus *i2c;

    int i;
@@ -1687,7 +1687,7 @@ static void musicpal_init(MachineState *machine) 
        qdev_connect_gpio_out(key_dev, i, qdev_get_gpio_in(dev, i + 15));

    }



    wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);

    wm8750_dev = i2c_slave_create_simple(i2c, TYPE_WM8750, MP_WM_ADDR);

    dev = qdev_new(TYPE_MV88W8618_AUDIO);

    s = SYS_BUS_DEVICE(dev);

    object_property_set_link(OBJECT(dev), "wm8750", OBJECT(wm8750_dev),

hw/arm/nseries.c

+4 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void n8x0_i2c_setup(struct n800_s *s) 
    I2CBus *i2c = omap_i2c_bus(s->mpu->i2c[0]);



    /* Attach a menelaus PM chip */

    dev = i2c_create_slave(i2c, "twl92230", N8X0_MENELAUS_ADDR);

    dev = DEVICE(i2c_slave_create_simple(i2c, "twl92230", N8X0_MENELAUS_ADDR));

    qdev_connect_gpio_out(dev, 3,

                          qdev_get_gpio_in(s->mpu->ih[0],

                                           OMAP_INT_24XX_SYS_NIRQ));
@@ -224,7 +224,7 @@ static void n8x0_i2c_setup(struct n800_s *s) 
    qemu_register_powerdown_notifier(&n8x0_system_powerdown_notifier);



    /* Attach a TMP105 PM chip (A0 wired to ground) */

    dev = i2c_create_slave(i2c, TYPE_TMP105, N8X0_TMP105_ADDR);

    dev = DEVICE(i2c_slave_create_simple(i2c, TYPE_TMP105, N8X0_TMP105_ADDR));

    qdev_connect_gpio_out(dev, 0, tmp_irq);

}
@@ -416,8 +416,8 @@ static void n810_kbd_setup(struct n800_s *s) 


    /* Attach the LM8322 keyboard to the I2C bus,

     * should happen in n8x0_i2c_setup and s->kbd be initialised here.  */

    s->kbd = i2c_create_slave(omap_i2c_bus(s->mpu->i2c[0]),

                           "lm8323", N810_LM8323_ADDR);

    s->kbd = DEVICE(i2c_slave_create_simple(omap_i2c_bus(s->mpu->i2c[0]),

                                            "lm8323", N810_LM8323_ADDR));

    qdev_connect_gpio_out(s->kbd, 0, kbd_irq);

}

hw/arm/pxa2xx.c

+3 −2
Original line number Diff line number Diff line
@@ -1522,8 +1522,9 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, 
    s = PXA2XX_I2C(i2c_dev);

    /* FIXME: Should the slave device really be on a separate bus?  */

    i2cbus = i2c_init_bus(dev, "dummy");

    dev = i2c_create_slave(i2cbus, TYPE_PXA2XX_I2C_SLAVE, 0);

    s->slave = PXA2XX_I2C_SLAVE(dev);

    s->slave = PXA2XX_I2C_SLAVE(i2c_slave_create_simple(i2cbus,

                                                        TYPE_PXA2XX_I2C_SLAVE,

                                                        0));

    s->slave->host = s;



    return s;

hw/arm/realview.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void realview_init(MachineState *machine, 


    dev = sysbus_create_simple(TYPE_VERSATILE_I2C, 0x10002000, NULL);

    i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");

    i2c_create_slave(i2c, "ds1338", 0x68);

    i2c_slave_create_simple(i2c, "ds1338", 0x68);



    /* Memory map for RealView Emulation Baseboard:  */

    /* 0x10000000 System registers.  */