Commit 75fb4577 authored by Joel Stanley's avatar Joel Stanley Committed by Peter Maydell
Browse files

hw/arm/aspeed: Add RTC to SoC 



All systems have an RTC.

The IRQ is hooked up but the model does not use it at this stage. There
is no guest code that uses it, so this limitation is acceptable.

Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 20190618165311.27066-5-clg@kaod.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 979672cf

hw/arm/aspeed_soc.c

+13 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ static void aspeed_soc_init(Object *obj) 
    sysbus_init_child_obj(obj, "vic", OBJECT(&s->vic), sizeof(s->vic),

                          TYPE_ASPEED_VIC);



    sysbus_init_child_obj(obj, "rtc", OBJECT(&s->rtc), sizeof(s->rtc),

                          TYPE_ASPEED_RTC);



    sysbus_init_child_obj(obj, "timerctrl", OBJECT(&s->timerctrl),

                          sizeof(s->timerctrl), TYPE_ASPEED_TIMER);

    object_property_add_const_link(OBJECT(&s->timerctrl), "scu",
@@ -275,6 +278,16 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 1,

                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));



    /* RTC */

    object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, sc->info->memmap[ASPEED_RTC]);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0,

                       aspeed_soc_get_irq(s, ASPEED_RTC));



    /* Timer */

    object_property_set_bool(OBJECT(&s->timerctrl), true, "realized", &err);

    if (err) {

include/hw/arm/aspeed_soc.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "hw/misc/aspeed_scu.h"

#include "hw/misc/aspeed_sdmc.h"

#include "hw/timer/aspeed_timer.h"

#include "hw/timer/aspeed_rtc.h"

#include "hw/i2c/aspeed_i2c.h"

#include "hw/ssi/aspeed_smc.h"

#include "hw/watchdog/wdt_aspeed.h"
@@ -32,6 +33,7 @@ typedef struct AspeedSoCState { 
    ARMCPU cpu;

    MemoryRegion sram;

    AspeedVICState vic;

    AspeedRtcState rtc;

    AspeedTimerCtrlState timerctrl;

    AspeedI2CState i2c;

    AspeedSCUState scu;