aspeed: add a watchdog controller
This enables reboot of a guest from U-Boot and Linux. Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Joel Stanley <joel@jms.id.au> Message-id: 1485452251-1593-3-git-send-email-clg@kaod.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
854123bf8d
commit
013befe1ca
|
@ -31,6 +31,7 @@
|
||||||
#define ASPEED_SOC_SCU_BASE 0x1E6E2000
|
#define ASPEED_SOC_SCU_BASE 0x1E6E2000
|
||||||
#define ASPEED_SOC_SRAM_BASE 0x1E720000
|
#define ASPEED_SOC_SRAM_BASE 0x1E720000
|
||||||
#define ASPEED_SOC_TIMER_BASE 0x1E782000
|
#define ASPEED_SOC_TIMER_BASE 0x1E782000
|
||||||
|
#define ASPEED_SOC_WDT_BASE 0x1E785000
|
||||||
#define ASPEED_SOC_I2C_BASE 0x1E78A000
|
#define ASPEED_SOC_I2C_BASE 0x1E78A000
|
||||||
|
|
||||||
static const int uart_irqs[] = { 9, 32, 33, 34, 10 };
|
static const int uart_irqs[] = { 9, 32, 33, 34, 10 };
|
||||||
|
@ -170,6 +171,10 @@ static void aspeed_soc_init(Object *obj)
|
||||||
sc->info->silicon_rev);
|
sc->info->silicon_rev);
|
||||||
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
|
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
|
||||||
"ram-size", &error_abort);
|
"ram-size", &error_abort);
|
||||||
|
|
||||||
|
object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
|
||||||
|
object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
|
||||||
|
qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
|
||||||
}
|
}
|
||||||
|
|
||||||
static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
||||||
|
@ -286,6 +291,14 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, ASPEED_SOC_SDMC_BASE);
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, ASPEED_SOC_SDMC_BASE);
|
||||||
|
|
||||||
|
/* Watch dog */
|
||||||
|
object_property_set_bool(OBJECT(&s->wdt), true, "realized", &err);
|
||||||
|
if (err) {
|
||||||
|
error_propagate(errp, err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void aspeed_soc_class_init(ObjectClass *oc, void *data)
|
static void aspeed_soc_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "hw/timer/aspeed_timer.h"
|
#include "hw/timer/aspeed_timer.h"
|
||||||
#include "hw/i2c/aspeed_i2c.h"
|
#include "hw/i2c/aspeed_i2c.h"
|
||||||
#include "hw/ssi/aspeed_smc.h"
|
#include "hw/ssi/aspeed_smc.h"
|
||||||
|
#include "hw/watchdog/wdt_aspeed.h"
|
||||||
|
|
||||||
#define ASPEED_SPIS_NUM 2
|
#define ASPEED_SPIS_NUM 2
|
||||||
|
|
||||||
|
@ -37,6 +38,7 @@ typedef struct AspeedSoCState {
|
||||||
AspeedSMCState fmc;
|
AspeedSMCState fmc;
|
||||||
AspeedSMCState spi[ASPEED_SPIS_NUM];
|
AspeedSMCState spi[ASPEED_SPIS_NUM];
|
||||||
AspeedSDMCState sdmc;
|
AspeedSDMCState sdmc;
|
||||||
|
AspeedWDTState wdt;
|
||||||
} AspeedSoCState;
|
} AspeedSoCState;
|
||||||
|
|
||||||
#define TYPE_ASPEED_SOC "aspeed-soc"
|
#define TYPE_ASPEED_SOC "aspeed-soc"
|
||||||
|
|
Loading…
Reference in a new issue