diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2013-12-17 19:42:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-12-17 20:12:51 +0000 |
| commit | 142593c9d700e02b316443bcaa99226720242625 (patch) | |
| tree | 8c00627f066519c96cc34a08e0635963806edda8 /hw/arm/digic.c | |
| parent | 576e99cb951e9c1a289555a31cfd5b9040e80037 (diff) | |
| download | focaccia-qemu-142593c9d700e02b316443bcaa99226720242625.tar.gz focaccia-qemu-142593c9d700e02b316443bcaa99226720242625.zip | |
hw/arm/digic: add UART support
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Message-id: 1387188908-754-5-git-send-email-antonynpavlov@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/digic.c')
| -rw-r--r-- | hw/arm/digic.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/hw/arm/digic.c b/hw/arm/digic.c index e8eb0de9a1..ec8c330602 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -24,6 +24,8 @@ #define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100) +#define DIGIC_UART_BASE 0xc0800000 + static void digic_init(Object *obj) { DigicState *s = DIGIC(obj); @@ -43,6 +45,11 @@ static void digic_init(Object *obj) snprintf(name, DIGIC_TIMER_NAME_MLEN, "timer[%d]", i); object_property_add_child(obj, name, OBJECT(&s->timer[i]), NULL); } + + object_initialize(&s->uart, sizeof(s->uart), TYPE_DIGIC_UART); + dev = DEVICE(&s->uart); + qdev_set_parent_bus(dev, sysbus_get_default()); + object_property_add_child(obj, "uart", OBJECT(&s->uart), NULL); } static void digic_realize(DeviceState *dev, Error **errp) @@ -74,6 +81,15 @@ static void digic_realize(DeviceState *dev, Error **errp) sbd = SYS_BUS_DEVICE(&s->timer[i]); sysbus_mmio_map(sbd, 0, DIGIC4_TIMER_BASE(i)); } + + object_property_set_bool(OBJECT(&s->uart), true, "realized", &err); + if (err != NULL) { + error_propagate(errp, err); + return; + } + + sbd = SYS_BUS_DEVICE(&s->uart); + sysbus_mmio_map(sbd, 0, DIGIC_UART_BASE); } static void digic_class_init(ObjectClass *oc, void *data) |