wip

Author: nordic-krch

samples/boards/nordic/system_off/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -0,0 +1,3 @@
+&uart135 {
+	zephyr,pm-device-runtime-auto;
+};

samples/boards/nordic/system_off/prj.conf

@@ -1,5 +1,9 @@
+CONFIG_PM=y
 CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
+CONFIG_UART_ASYNC_API=y
 CONFIG_GPIO=y
+CONFIG_NRF_REGTOOL_VERBOSITY=2
 CONFIG_CRC=y
 CONFIG_POWEROFF=y
 CONFIG_HWINFO=y

samples/boards/nordic/system_off/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay

@@ -0,0 +1,4 @@
+&uart135 {
+	status = "disabled";
+	zephyr,pm-device-runtime-auto;
+};

samples/boards/nordic/system_off/remote/prj.conf

@@ -1,2 +1,9 @@
+CONFIG_PM=y
 CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
+CONFIG_UART_ASYNC_API=y
+CONFIG_SERIAL=n
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_NRF_REGTOOL_VERBOSITY=2

samples/boards/nordic/system_off/remote/src/main.c

@@ -6,26 +6,26 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 #include <zephyr/sys/poweroff.h>
 #include <hal/nrf_memconf.h>
 
 int main(void)
 {
-	int rc;
-	const struct device *const cons = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
-
-	printf("%s system off demo. Ready for system off.\n", CONFIG_BOARD);
-
-	rc = pm_device_action_run(cons, PM_DEVICE_ACTION_SUSPEND);
-	if (rc < 0) {
-		printf("Could not suspend console (%d)\n", rc);
-		return 0;
+	if (IS_ENABLED(CONFIG_CONSOLE)) {
+		printf("%s system off demo. Ready for system off.\n", CONFIG_BOARD);
 	}
 
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_MASK, false);
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_MASK, false);
+	if (0) {
+		/*nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_MASK, false);*/
+		/*nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_MASK, false);*/
+		k_sleep(K_FOREVER);
+	} else {
+		/*nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_MASK, false);*/
+		/*nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_MASK, false);*/
 
-	sys_poweroff();
+		sys_poweroff();
+	}
 
 	return 0;
 }

samples/boards/nordic/system_off/src/main.c

@@ -19,6 +19,9 @@
 #include <zephyr/sys/util.h>
 
 #define NON_WAKEUP_RESET_REASON (RESET_PIN | RESET_SOFTWARE | RESET_POR | RESET_DEBUG)
+#include <zephyr/pm/device_runtime.h>
+#include <hal/nrf_gpio.h>
+#include <hal/nrf_memconf.h>
 
 #if defined(CONFIG_GRTC_WAKEUP_ENABLE)
 #include <zephyr/drivers/timer/nrf_grtc_timer.h>
@@ -28,16 +31,18 @@
 static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
 #endif
 #if defined(CONFIG_LPCOMP_WAKEUP_ENABLE)
-static const uint32_t port_sw1 = DT_PROP(DT_GPIO_CTLR_BY_IDX(DT_ALIAS(sw1), gpios, 0), port);
 static const struct device *comp_dev = DEVICE_DT_GET(DT_NODELABEL(comp));
 #endif
 
+static const struct gpio_dt_spec sw1 = GPIO_DT_SPEC_GET(DT_ALIAS(sw1), gpios);
+static const uint32_t port_sw1 = DT_PROP(DT_GPIO_CTLR_BY_IDX(DT_ALIAS(sw1), gpios, 0), port);
+
 int print_reset_cause(uint32_t reset_cause)
 {
 	int32_t ret;
 	uint32_t supported;
 
-	ret = hwinfo_get_supported_reset_cause((uint32_t *) &supported);
+	ret = hwinfo_get_supported_reset_cause((uint32_t *)&supported);
 
 	if (ret || !(reset_cause & supported)) {
 		return -ENOTSUP;
@@ -109,9 +114,9 @@ int main(void)
 	int err = z_nrf_grtc_wakeup_prepare(DEEP_SLEEP_TIME_S * USEC_PER_SEC);
 
 	if (err < 0) {
-		printk("Unable to prepare GRTC as a wake up source (err = %d).\n", err);
+		printf("Unable to prepare GRTC as a wake up source (err = %d).\n", err);
 	} else {
-		printk("Entering system off; wait %u seconds to restart\n", DEEP_SLEEP_TIME_S);
+		printf("Entering system off; wait %u seconds to restart\n", DEEP_SLEEP_TIME_S);
 	}
 #endif
 #if defined(CONFIG_GPIO_WAKEUP_ENABLE)
@@ -122,24 +127,22 @@ int main(void)
 		return 0;
 	}
 
-	rc = gpio_pin_configure_dt(&sw1, GPIO_INPUT);
-	if (rc < 0) {
-		printf("Could not configure sw1 GPIO (%d)\n", rc);
-		return 0;
-	}
-
 	rc = gpio_pin_interrupt_configure_dt(&sw0, GPIO_INT_LEVEL_ACTIVE);
 	if (rc < 0) {
 		printf("Could not configure sw0 GPIO interrupt (%d)\n", rc);
 		return 0;
 	}
-	//code reorder needed
 #endif
 #if defined(CONFIG_LPCOMP_WAKEUP_ENABLE)
 	comparator_set_trigger(comp_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
 	comparator_trigger_is_pending(comp_dev);
 	printf("Entering system off; change signal level at comparator input to restart\n");
 #endif
+	rc = gpio_pin_configure_dt(&sw1, GPIO_INPUT);
+	if (rc < 0) {
+		printf("Could not configure sw1 GPIO (%d)\n", rc);
+		return 0;
+	}
 
 	rc = gpio_pin_interrupt_configure_dt(&sw1, GPIO_INT_LEVEL_ACTIVE);
 	if (rc < 0) {
@@ -165,6 +168,7 @@ int main(void)
 		retained_update();
 	}
 
+	k_sleep(K_MSEC(4000));
 	if (do_poweroff) {
 #if CONFIG_SOC_NRF54H20_CPUAPP
 		/* Local RAM0 (TCM) is currently not used so retention can be disabled. */

soc/nordic/nrf54h/power.c

@@ -70,7 +70,12 @@ void nrf_poweroff(void)
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
+#if defined(CONFIG_SOC_NRF54H20_CPURAD)
+	nrf_lrcconf_retain_set(NRF_LRCCONF010,
+			NRF_LRCCONF_POWER_DOMAIN_0 | NRF_LRCCONF_POWER_DOMAIN_1, false);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010,
+			NRF_LRCCONF_POWER_DOMAIN_0 | NRF_LRCCONF_POWER_DOMAIN_1, false);
+#else
 	/* Disable retention */
 	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
 	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);