[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 06/11] arm: Instantiate NRF51 general purpose I/O
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-arm] [PATCH 06/11] arm: Instantiate NRF51 general purpose I/O |
Date: |
Thu, 3 Jan 2019 09:11:14 +0000 |
From: Steffen Görtz <address@hidden>
Instantiates GPIO peripheral model
Signed-off-by: Steffen Görtz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
include/hw/arm/nrf51_soc.h | 2 ++
hw/arm/nrf51_soc.c | 16 ++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h
index 9e3ba916bd..84e0278881 100644
--- a/include/hw/arm/nrf51_soc.h
+++ b/include/hw/arm/nrf51_soc.h
@@ -14,6 +14,7 @@
#include "hw/arm/armv7m.h"
#include "hw/char/nrf51_uart.h"
#include "hw/misc/nrf51_rng.h"
+#include "hw/gpio/nrf51_gpio.h"
#define TYPE_NRF51_SOC "nrf51-soc"
#define NRF51_SOC(obj) \
@@ -28,6 +29,7 @@ typedef struct NRF51State {
NRF51UARTState uart;
NRF51RNGState rng;
+ NRF51GPIOState gpio;
MemoryRegion iomem;
MemoryRegion sram;
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index d2a19b8ead..db817fe506 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -99,6 +99,19 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error
**errp)
qdev_get_gpio_in(DEVICE(&s->cpu),
BASE_TO_IRQ(NRF51_RNG_BASE)));
+ /* GPIO */
+ object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0);
+ memory_region_add_subregion_overlap(&s->container, NRF51_GPIO_BASE, mr, 0);
+
+ /* Pass all GPIOs to the SOC layer so they are available to the board */
+ qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL);
+
create_unimplemented_device("nrf51_soc.io", NRF51_IOMEM_BASE,
NRF51_IOMEM_SIZE);
create_unimplemented_device("nrf51_soc.ficr", NRF51_FICR_BASE,
@@ -126,6 +139,9 @@ static void nrf51_soc_init(Object *obj)
sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng),
TYPE_NRF51_RNG);
+
+ sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),
+ TYPE_NRF51_GPIO);
}
static Property nrf51_soc_properties[] = {
--
2.19.2
- [Qemu-arm] [PATCH 00/11] arm: Core nRF51 Devices and Microbit Support, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 02/11] arm: Add header to host common definition for nRF51 SOC peripherals, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 01/11] qtest: Add set_irq_in command to set IRQ/GPIO level, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 04/11] arm: Instantiate NRF51 random number generator, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 03/11] hw/misc/nrf51_rng: Add NRF51 random number generator peripheral, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 05/11] hw/gpio/nrf51_gpio: Add nRF51 GPIO peripheral, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 06/11] arm: Instantiate NRF51 general purpose I/O,
Stefan Hajnoczi <=
- [Qemu-arm] [PATCH 07/11] tests/microbit-test: Add Tests for nRF51 GPIO, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 08/11] hw/timer/nrf51_timer: Add nRF51 Timer peripheral, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 09/11] arm: Instantiate NRF51 Timers, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 10/11] tests/microbit-test: Add Tests for nRF51 Timer, Stefan Hajnoczi, 2019/01/03
- [Qemu-arm] [PATCH 11/11] arm: Add Clock peripheral stub to NRF51 SOC, Stefan Hajnoczi, 2019/01/03
- Re: [Qemu-arm] [PATCH 00/11] arm: Core nRF51 Devices and Microbit Support, Peter Maydell, 2019/01/07