Merge branch 'main' into fix_bt_att_chan_create_pdu_deadlock_test

Author: KyraLengfeld

samples/boards/nordic/system_off/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -0,0 +1,22 @@
+/ {
+	sram0_image@2006f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2006f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemdevice = &retainedmem0;
+	};
+};
+
+&sram0_image {
+	/* Shrink SRAM size to avoid overlap with retained memory region */
+	reg = <0x20000000 DT_SIZE_K(444)>;
+};

samples/boards/nordic/system_off/sample.yaml

@@ -29,6 +29,7 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l05/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp

soc/nordic/common/poweroff.c

@@ -50,14 +50,6 @@ void z_sys_poweroff(void)
 
 	/* Disable retention for all memory blocks */
 	nrfx_ram_ctrl_retention_enable_set(ram_start, ram_size, false);
-#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L05_XXAA)
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
-	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
-#endif
-#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L10_XXAA)
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
-	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
-#endif
 
 #endif /* defined(CONFIG_HAS_NORDIC_RAM_CTRL) */
 

soc/nordic/nrf53/Kconfig

@@ -13,6 +13,7 @@ config SOC_SERIES_NRF53X
 	imply XIP
 	select HAS_NRFX
 	select HAS_NORDIC_DRIVERS
+	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_SWO
 	help

tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -0,0 +1 @@
+CONFIG_RETAINED_MEM_NRF_GPREGRET=n

tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -0,0 +1,29 @@
+/ {
+	sram0_image@2006f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2006f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&gpregret1 {
+	status = "disabled";
+};
+
+&gpregret2 {
+	status = "disabled";
+};
+
+&sram0_image {
+	reg = <0x20000000 DT_SIZE_K(444)>;
+};

tests/drivers/retained_mem/api/testcase.yaml

@@ -7,6 +7,7 @@ tests:
   drivers.retained_mem.api.ram:
     platform_allow:
       - qemu_cortex_m3
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54l09pdk/nrf54l09/cpuapp