[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 09/14] arm: Instantiate NRF51 general purpose I/O
From: |
Steffen Görtz |
Subject: |
[Qemu-devel] [PATCH v5 09/14] arm: Instantiate NRF51 general purpose I/O |
Date: |
Mon, 12 Nov 2018 16:42:19 -0500 |
Instantiates GPIO peripheral model
Signed-off-by: Steffen Görtz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
hw/arm/nrf51_soc.c | 16 ++++++++++++++++
include/hw/arm/nrf51_soc.h | 2 ++
2 files changed, 18 insertions(+)
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index e6956f9ef7..893627b7aa 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -116,6 +116,19 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error
**errp)
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 3);
memory_region_add_subregion_overlap(&s->container, NRF51_FLASH_BASE, mr,
0);
+ /* 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);
@@ -145,6 +158,9 @@ static void nrf51_soc_init(Object *obj)
sysbus_init_child_obj(obj, "nvm", &s->nvm, sizeof(s->nvm), TYPE_NRF51_NVM);
+ sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),
+ TYPE_NRF51_GPIO);
+
}
static Property nrf51_soc_properties[] = {
diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h
index c3f4d5bcdc..d4a48ccf91 100644
--- a/include/hw/arm/nrf51_soc.h
+++ b/include/hw/arm/nrf51_soc.h
@@ -15,6 +15,7 @@
#include "hw/char/nrf51_uart.h"
#include "hw/misc/nrf51_rng.h"
#include "hw/nvram/nrf51_nvm.h"
+#include "hw/gpio/nrf51_gpio.h"
#define TYPE_NRF51_SOC "nrf51-soc"
#define NRF51_SOC(obj) \
@@ -30,6 +31,7 @@ typedef struct NRF51State {
NRF51UARTState uart;
NRF51RNGState rng;
NRF51NVMState nvm;
+ NRF51GPIOState gpio;
MemoryRegion iomem;
MemoryRegion sram;
--
2.19.1
- [Qemu-devel] [PATCH v5 05/14] hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories, (continued)
- [Qemu-devel] [PATCH v5 05/14] hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 04/14] arm: Instantiate NRF51 random number generator, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 03/14] hw/misc/nrf51_rng: Add NRF51 random number generator peripheral, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 06/14] arm: Instantiate NRF51 special NVM's and NVMC, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 08/14] hw/gpio/nrf51_gpio: Add nRF51 GPIO peripheral, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 02/14] arm: Add header to host common definition for nRF51 SOC peripherals, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 10/14] tests/microbit-test: Add Tests for nRF51 GPIO, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 09/14] arm: Instantiate NRF51 general purpose I/O,
Steffen Görtz <=
- [Qemu-devel] [PATCH v5 13/14] tests/microbit-test: Add Tests for nRF51 Timer, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 11/14] hw/timer/nrf51_timer: Add nRF51 Timer peripheral, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 12/14] arm: Instantiate NRF51 Timers, Steffen Görtz, 2018/11/12
- [Qemu-devel] [PATCH v5 14/14] arm: Add Clock peripheral stub to NRF51 SOC, Steffen Görtz, 2018/11/12
- Re: [Qemu-devel] [PATCH v5 00/14] arm: nRF51 Devices and Microbit Support, no-reply, 2018/11/13
- Re: [Qemu-devel] [PATCH v5 00/14] arm: nRF51 Devices and Microbit Support, no-reply, 2018/11/13
- Re: [Qemu-devel] [PATCH v5 00/14] arm: nRF51 Devices and Microbit Support, Peter Maydell, 2018/11/16
- Re: [Qemu-devel] [PATCH v5 00/14] arm: nRF51 Devices and Microbit Support, Stefan Hajnoczi, 2018/11/19