Revision 02e2da45 hw/stellaris.c

b/hw/stellaris.c
874 874
static void stellaris_i2c_init(SysBusDevice * dev)
875 875
{
876 876
    stellaris_i2c_state *s = FROM_SYSBUS(stellaris_i2c_state, dev);
877
    i2c_bus *bus = i2c_init_bus();
877
    i2c_bus *bus;
878 878
    int iomemtype;
879 879

  
880 880
    sysbus_init_irq(dev, &s->irq);
881
    qdev_attach_child_bus(&dev->qdev, "i2c", bus);
881
    bus = i2c_init_bus(&dev->qdev, "i2c");
882 882
    s->bus = bus;
883 883

  
884 884
    iomemtype = cpu_register_io_memory(0, stellaris_i2c_readfn,
......
1239 1239
{
1240 1240
    stellaris_ssi_bus_state *s = FROM_SSI_SLAVE(stellaris_ssi_bus_state, dev);
1241 1241

  
1242
    s->bus[0] = ssi_create_bus();
1243
    qdev_attach_child_bus(&dev->qdev, "ssi0", s->bus[0]);
1244
    s->bus[1] = ssi_create_bus();
1245
    qdev_attach_child_bus(&dev->qdev, "ssi1", s->bus[1]);
1242
    s->bus[0] = ssi_create_bus(&dev->qdev, "ssi0");
1243
    s->bus[1] = ssi_create_bus(&dev->qdev, "ssi1");
1246 1244
    qdev_init_gpio_in(&dev->qdev, stellaris_ssi_bus_select, 1);
1247 1245

  
1248 1246
    register_savevm("stellaris_ssi_bus", -1, 1,
......
1320 1318
    if (board->dc2 & (1 << 12)) {
1321 1319
        DeviceState *dev;
1322 1320
        dev = sysbus_create_simple("stellaris-i2c", 0x40020000, pic[8]);
1323
        i2c = qdev_get_child_bus(dev, "i2c");
1321
        i2c = (i2c_bus *)qdev_get_child_bus(dev, "i2c");
1324 1322
        if (board->peripherals & BP_OLED_I2C) {
1325 1323
            i2c_create_slave(i2c, "ssd0303", 0x3d);
1326 1324
        }

Also available in: Unified diff