hw/i2c: QOM'ify exynos4210_i2c.c
* Rename the exynos4210_i2c_realize to exynos4210_i2c_init * Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com> Message-id: 1465815255-21776-3-git-send-email-zxq_yx_007@163.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
00b2f75870
commit
93d6599f46
|
@ -299,33 +299,32 @@ static void exynos4210_i2c_reset(DeviceState *d)
|
||||||
s->scl_free = true;
|
s->scl_free = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int exynos4210_i2c_realize(SysBusDevice *sbd)
|
static void exynos4210_i2c_init(Object *obj)
|
||||||
{
|
{
|
||||||
DeviceState *dev = DEVICE(sbd);
|
DeviceState *dev = DEVICE(obj);
|
||||||
Exynos4210I2CState *s = EXYNOS4_I2C(dev);
|
Exynos4210I2CState *s = EXYNOS4_I2C(obj);
|
||||||
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
||||||
|
|
||||||
memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_i2c_ops, s,
|
memory_region_init_io(&s->iomem, obj, &exynos4210_i2c_ops, s,
|
||||||
TYPE_EXYNOS4_I2C, EXYNOS4_I2C_MEM_SIZE);
|
TYPE_EXYNOS4_I2C, EXYNOS4_I2C_MEM_SIZE);
|
||||||
sysbus_init_mmio(sbd, &s->iomem);
|
sysbus_init_mmio(sbd, &s->iomem);
|
||||||
sysbus_init_irq(sbd, &s->irq);
|
sysbus_init_irq(sbd, &s->irq);
|
||||||
s->bus = i2c_init_bus(dev, "i2c");
|
s->bus = i2c_init_bus(dev, "i2c");
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void exynos4210_i2c_class_init(ObjectClass *klass, void *data)
|
static void exynos4210_i2c_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
SysBusDeviceClass *sbdc = SYS_BUS_DEVICE_CLASS(klass);
|
|
||||||
|
|
||||||
dc->vmsd = &exynos4210_i2c_vmstate;
|
dc->vmsd = &exynos4210_i2c_vmstate;
|
||||||
dc->reset = exynos4210_i2c_reset;
|
dc->reset = exynos4210_i2c_reset;
|
||||||
sbdc->init = exynos4210_i2c_realize;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo exynos4210_i2c_type_info = {
|
static const TypeInfo exynos4210_i2c_type_info = {
|
||||||
.name = TYPE_EXYNOS4_I2C,
|
.name = TYPE_EXYNOS4_I2C,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(Exynos4210I2CState),
|
.instance_size = sizeof(Exynos4210I2CState),
|
||||||
|
.instance_init = exynos4210_i2c_init,
|
||||||
.class_init = exynos4210_i2c_class_init,
|
.class_init = exynos4210_i2c_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue