Merge branch 'nrfconnect:main' into twt-responder-initialization

nrfconnect · Dec 18, 2024 · de5a397 · de5a397
2 parents 23b0885 + 7c3bd68
commit de5a397
Show file tree

Hide file tree

Showing 49 changed files with 339 additions and 50 deletions.
diff --git a/boards/native/nrf_bsim/doc/nrf5340bsim.rst b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
@@ -34,6 +34,7 @@ These boards include models of some of the nRF5340 SOC peripherals:
 * DPPI (Distributed Programmable Peripheral Interconnect)
 * EGU (Event Generator Unit)
 * FICR (Factory Information Configuration Registers)
+* GPIO & GPIOTE
 * IPC (Interprocessor communication)
 * MUTEX (Mutual exclusive peripheral)
 * NVMC (Non-Volatile Memory Controller / Flash)
@@ -42,6 +43,7 @@ These boards include models of some of the nRF5340 SOC peripherals:
 * RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
+* UARTE (UART with Easy DMA)
 * UICR (User Information Configuration Registers)
 
 and will use the same drivers as the nrf5340dk targets for these.

diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -42,13 +42,15 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * ECB (AES electronic codebook mode encryption)
 * EGU (Event Generator Unit)
 * FICR (Factory Information Configuration Registers)
+* GPIO & GPIOTE
 * GRTC (Global Real-time Counter)
 * PPIB (PPI Bridge)
 * RADIO
 * RRAMC (Resistive RAM Controller)
 * RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
+* UARTE (UART with Easy DMA)
 * UICR (User Information Configuration Registers)
 
 and will use the same drivers as the nrf54l15dk targets for these.

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -8,6 +8,7 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf5340_cpuapp.dtsi>
+#include <../boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF5340 BSIM NRF5340 Application";
@@ -35,9 +36,6 @@
 		/delete-property/ i2s-0;
 		/delete-property/ qdec-0;
 		/delete-property/ qdec-1;
-		/delete-property/ gpio-0;
-		/delete-property/ gpio-1;
-		/delete-property/ gpiote-0;
 	};
 
 	chosen {
@@ -82,11 +80,8 @@
 			/delete-node/ regulator@37000;
 			/delete-node/ kmu@39000;
 			/delete-node/ vmc@81000;
-			/delete-node/ gpio@842500;
-			/delete-node/ gpio@842800;
 		};
 		/delete-node/ spu@50003000;
-		/delete-node/ gpiote@5000d000;
 		/delete-node/ crypto@50844000;
 	};
 
@@ -112,6 +107,27 @@
 	};
 };
 
+
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the
  * buffer won't be used.
  */

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
@@ -9,7 +9,7 @@ toolchain:
   - zephyr
 testing:
   ignore_tags:
-    - gpio
     - modem
-    - uart
     - bsim_skip_CI
+supported:
+  - gpio
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@@ -8,6 +8,7 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf5340_cpunet.dtsi>
+#include <../boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF5340 BSIM NRF5340 Network";
@@ -17,15 +18,13 @@
 	aliases {
 		/delete-property/ sram-0;
 		/delete-property/ sram-1;
-		/delete-property/ gpiote-0;
 		/delete-property/ wdt-0;
 		/delete-property/ i2c-0;
 		/delete-property/ spi-0;
-		/delete-property/ gpio-0;
-		/delete-property/ gpio-1;
 	};
 
 	chosen {
+		zephyr,console = &uart0;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
@@ -36,14 +35,11 @@
 	soc {
 		/delete-node/ memory@20000000;
 		/delete-node/ memory@21000000;
-		/delete-node/ gpiote@4100a000;
 		/delete-node/ watchdog@4100b000;
 		/delete-node/ i2c@41013000;
 		/delete-node/ spi@41013000;
 		/delete-node/ acl@41080000;
 		/delete-node/ vmc@41081000;
-		/delete-node/ gpio@418c0500;
-		/delete-node/ gpio@418c0800;
 	};
 
 	/delete-node/ cpus;
@@ -73,6 +69,26 @@
 	};
 };
 
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the
  * buffer won't be used.
  */

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
@@ -9,7 +9,7 @@ toolchain:
   - zephyr
 testing:
   ignore_tags:
-    - gpio
     - modem
-    - uart
     - bsim_skip_CI
+supported:
+  - gpio
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -8,57 +8,48 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf54l15_cpuapp.dtsi>
+#include <../boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF54L15 BSIM NRF54L15 Application";
 	compatible = "bsim,nrf54l15-bsim-nrf54l15-cpuapp", "bsim,nrf54";
 
 	chosen {
 		zephyr,entropy = &rng;
+		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
 	};
 
 	/delete-node/ cpus;
-	/delete-node/ clocks;
 	/delete-node/ sw-pwm;
 
 	soc {
 		/delete-node/ memory@20000000;
 		/delete-node/ memory@2002f000;
 		peripheral@50000000 {
 			/delete-node/ spi@4a000;
-			/delete-node/ uart@4a000;
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
-			/delete-node/ gpio@50400;
 			/delete-node/ i2c@c6000;
 			/delete-node/ spi@c6000;
-			/delete-node/ uart@c6000;
 			/delete-node/ i2c@c7000;
 			/delete-node/ spi@c7000;
-			/delete-node/ uart@c7000;
 			/delete-node/ i2c@c8000;
 			/delete-node/ spi@c8000;
-			/delete-node/ uart@c8000;
 			/delete-node/ pwm@d2000;
 			/delete-node/ pwm@d3000;
 			/delete-node/ pwm@d4000;
 			/delete-node/ adc@d5000;
 			/delete-node/ nfct@d6000;
-			/delete-node/ gpio@d8200;
-			/delete-node/ gpiote@da000;
 			/delete-node/ i2s@dd000;
 			/delete-node/ qdec@e0000;
 			/delete-node/ qdec@e1000;
 			/delete-node/ i2c@104000;
 			/delete-node/ spi@104000;
-			/delete-node/ uart@104000;
 			/delete-node/ watchdog@108000;
 			/delete-node/ watchdog@109000;
-			/delete-node/ gpio@10a000;
-			/delete-node/ gpiote@10c000;
 		};
 	};
 
@@ -93,6 +84,45 @@
 	};
 };
 
+&uart00 {
+	/delete-property/ clocks;
+};
+
+&uart20 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
 &temp {
 	status = "okay";
 };

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
@@ -9,9 +9,8 @@ toolchain:
   - zephyr
 supported:
   - counter
+  - gpio
 testing:
   ignore_tags:
-    - gpio
     - modem
-    - uart
     - bsim_skip_CI
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -269,7 +269,7 @@ ipc0: &cpuapp_cpurad_ipc {
 
 	mx25uw63: mx25uw6345g@0 {
 		compatible = "jedec,mspi-nor";
-		status = "okay";
+		status = "disabled";
 		reg = <0>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [

diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -260,7 +260,7 @@ ipc0: &cpuapp_cpurad_ipc {
 
 	mx25uw63: mx25uw6345g@0 {
 		compatible = "jedec,mspi-nor";
-		status = "okay";
+		status = "disabled";
 		reg = <0>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [

diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
@@ -52,6 +52,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
     -imacros ${AUTOCONF_H}
     ${current_includes}
     ${template_script_defines}
+    -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
     -E ${LINKER_SCRIPT}
     -P # Prevent generation of debug `#line' directives.
     -o ${linker_script_gen}

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
@@ -374,7 +374,8 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0: