mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/stellaris: Convert I2C controller to Resettable interface

Browse Source 
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240213155214.13619-3-philmd@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-13 16:52:12 +01:00 committed by Peter Maydell
parent bebd89e166
commit cee78fa513
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/arm/stellaris.c
View File

@ -462,7 +462,10 @@ static void stellaris_sys_instance_init(Object *obj)
s->sysclk = qdev_init_clock_out(DEVICE(s), "SYSCLK"); s->sysclk = qdev_init_clock_out(DEVICE(s), "SYSCLK");
} }
/* I2C controller. */ /*
* I2C controller.
* ??? For now we only implement the master interface.
*/
#define TYPE_STELLARIS_I2C "stellaris-i2c" #define TYPE_STELLARIS_I2C "stellaris-i2c"
OBJECT_DECLARE_SIMPLE_TYPE(stellaris_i2c_state, STELLARIS_I2C) OBJECT_DECLARE_SIMPLE_TYPE(stellaris_i2c_state, STELLARIS_I2C)
@ -607,10 +610,17 @@ static void stellaris_i2c_write(void *opaque, hwaddr offset,
stellaris_i2c_update(s); stellaris_i2c_update(s);
} }
static void stellaris_i2c_reset(stellaris_i2c_state *s) static void stellaris_i2c_reset_enter(Object *obj, ResetType type)
{ {
stellaris_i2c_state *s = STELLARIS_I2C(obj);
if (s->mcs & STELLARIS_I2C_MCS_BUSBSY) if (s->mcs & STELLARIS_I2C_MCS_BUSBSY)
i2c_end_transfer(s->bus); i2c_end_transfer(s->bus);
}
static void stellaris_i2c_reset_hold(Object *obj)
{
stellaris_i2c_state *s = STELLARIS_I2C(obj);
s->msa = 0; s->msa = 0;
s->mcs = 0; s->mcs = 0;
@ -619,6 +629,12 @@ static void stellaris_i2c_reset(stellaris_i2c_state *s)
s->mimr = 0; s->mimr = 0;
s->mris = 0; s->mris = 0;
s->mcr = 0; s->mcr = 0;
}
static void stellaris_i2c_reset_exit(Object *obj)
{
stellaris_i2c_state *s = STELLARIS_I2C(obj);
stellaris_i2c_update(s); stellaris_i2c_update(s);
} }
@ -658,8 +674,6 @@ static void stellaris_i2c_init(Object *obj)
memory_region_init_io(&s->iomem, obj, &stellaris_i2c_ops, s, memory_region_init_io(&s->iomem, obj, &stellaris_i2c_ops, s,
"i2c", 0x1000); "i2c", 0x1000);
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
/* ??? For now we only implement the master interface. */
stellaris_i2c_reset(s);
} }
/* Analogue to Digital Converter. This is only partially implemented, /* Analogue to Digital Converter. This is only partially implemented,
@ -1396,7 +1410,11 @@ type_init(stellaris_machine_init)
static void stellaris_i2c_class_init(ObjectClass *klass, void *data) static void stellaris_i2c_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
rc->phases.enter = stellaris_i2c_reset_enter;
rc->phases.hold = stellaris_i2c_reset_hold;
rc->phases.exit = stellaris_i2c_reset_exit;
dc->vmsd = &vmstate_stellaris_i2c; dc->vmsd = &vmstate_stellaris_i2c;
} }