ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm: Instantiate NRF51 Timers 

Instantiates TIMER0 - TIMER2

Signed-off-by: Steffen Görtz <contrib@steffen-goertz.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20190103091119.9367-10-stefanha@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Steffen Görtz 2019-01-07 15:23:47 +00:00 committed by Peter Maydell
parent c5a4829c08
commit 60facd906b
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/arm/nrf51_soc.c
View File

@ -39,6 +39,8 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)
NRF51State *s = NRF51_SOC(dev_soc); NRF51State *s = NRF51_SOC(dev_soc);
MemoryRegion *mr; MemoryRegion *mr;
Error *err = NULL; Error *err = NULL;
uint8_t i = 0;
hwaddr base_addr = 0;
if (!s->board_memory) { if (!s->board_memory) {
error_setg(errp, "memory property was not set"); error_setg(errp, "memory property was not set");
@ -112,6 +114,22 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)
/* Pass all GPIOs to the SOC layer so they are available to the board */ /* Pass all GPIOs to the SOC layer so they are available to the board */
qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL); qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL);
/* TIMER */
for (i = 0; i < NRF51_NUM_TIMERS; i++) {
object_property_set_bool(OBJECT(&s->timer[i]), true, "realized", &err);
if (err) {
error_propagate(errp, err);
return;
}
base_addr = NRF51_TIMER_BASE + i * NRF51_TIMER_SIZE;
sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer[i]), 0, base_addr);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0,
qdev_get_gpio_in(DEVICE(&s->cpu),
BASE_TO_IRQ(base_addr)));
}
create_unimplemented_device("nrf51_soc.io", NRF51_IOMEM_BASE, create_unimplemented_device("nrf51_soc.io", NRF51_IOMEM_BASE,
NRF51_IOMEM_SIZE); NRF51_IOMEM_SIZE);
create_unimplemented_device("nrf51_soc.ficr", NRF51_FICR_BASE, create_unimplemented_device("nrf51_soc.ficr", NRF51_FICR_BASE,
@ -122,6 +140,8 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)
static void nrf51_soc_init(Object *obj) static void nrf51_soc_init(Object *obj)
{ {
uint8_t i = 0;
NRF51State *s = NRF51_SOC(obj); NRF51State *s = NRF51_SOC(obj);
memory_region_init(&s->container, obj, "nrf51-container", UINT64_MAX); memory_region_init(&s->container, obj, "nrf51-container", UINT64_MAX);
@ -142,6 +162,12 @@ static void nrf51_soc_init(Object *obj)
sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio), sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),
TYPE_NRF51_GPIO); TYPE_NRF51_GPIO);
for (i = 0; i < NRF51_NUM_TIMERS; i++) {
sysbus_init_child_obj(obj, "timer[*]", &s->timer[i],
sizeof(s->timer[i]), TYPE_NRF51_TIMER);
}
} }
static Property nrf51_soc_properties[] = { static Property nrf51_soc_properties[] = {

4
include/hw/arm/nrf51_soc.h
View File

@ -15,11 +15,14 @@
#include "hw/char/nrf51_uart.h" #include "hw/char/nrf51_uart.h"
#include "hw/misc/nrf51_rng.h" #include "hw/misc/nrf51_rng.h"
#include "hw/gpio/nrf51_gpio.h" #include "hw/gpio/nrf51_gpio.h"
#include "hw/timer/nrf51_timer.h"
#define TYPE_NRF51_SOC "nrf51-soc" #define TYPE_NRF51_SOC "nrf51-soc"
#define NRF51_SOC(obj) \ #define NRF51_SOC(obj) \
OBJECT_CHECK(NRF51State, (obj), TYPE_NRF51_SOC) OBJECT_CHECK(NRF51State, (obj), TYPE_NRF51_SOC)
#define NRF51_NUM_TIMERS 3
typedef struct NRF51State { typedef struct NRF51State {
/*< private >*/ /*< private >*/
SysBusDevice parent_obj; SysBusDevice parent_obj;
@ -30,6 +33,7 @@ typedef struct NRF51State {
NRF51UARTState uart; NRF51UARTState uart;
NRF51RNGState rng; NRF51RNGState rng;
NRF51GPIOState gpio; NRF51GPIOState gpio;
NRF51TimerState timer[NRF51_NUM_TIMERS];
MemoryRegion iomem; MemoryRegion iomem;
MemoryRegion sram; MemoryRegion sram;