diff options
| author | Philippe Mathieu-Daudé | 2020-05-04 09:28:19 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-05-11 12:05:11 +0200 |
| commit | 54595a5731ed7c94491008b0d3835ad3f786dbcc (patch) | |
| tree | 0cda40c3a15b86634e05949c8cafa4f96d1885ca /hw/arm/nrf51_soc.c | |
| parent | aspeed: sdmc: Implement AST2600 locking behaviour (diff) | |
| download | qemu-54595a5731ed7c94491008b0d3835ad3f786dbcc.tar.gz qemu-54595a5731ed7c94491008b0d3835ad3f786dbcc.tar.xz qemu-54595a5731ed7c94491008b0d3835ad3f786dbcc.zip | |
hw/arm/nrf51: Add NRF51_PERIPHERAL_SIZE definition
On the NRF51 series, all peripherals have a fixed I/O size
of 4KiB. Define NRF51_PERIPHERAL_SIZE and use it.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200504072822.18799-2-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/nrf51_soc.c')
| -rw-r--r-- | hw/arm/nrf51_soc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 57eff63f0d..e50473fd19 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -156,7 +156,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) return; } - base_addr = NRF51_TIMER_BASE + i * NRF51_TIMER_SIZE; + base_addr = NRF51_TIMER_BASE + i * NRF51_PERIPHERAL_SIZE; sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer[i]), 0, base_addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0, @@ -166,7 +166,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) /* STUB Peripherals */ memory_region_init_io(&s->clock, OBJECT(dev_soc), &clock_ops, NULL, - "nrf51_soc.clock", 0x1000); + "nrf51_soc.clock", NRF51_PERIPHERAL_SIZE); memory_region_add_subregion_overlap(&s->container, NRF51_IOMEM_BASE, &s->clock, -1); |