system off sample: nrf54h20 alignement

Enabled LATCH reading on sw1 this need additiona REATAIN bits
manipulation. Changed console to be handled automatically,
otherwise there are some unknown characters when console
is suspended. Removed obsolete configs.

Signed-off-by: Łukasz Stępnicki <[email protected]>

Author: lstnl

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

@@ -1,3 +1,4 @@
-&uart135 {
+&uart136 {
 	zephyr,pm-device-runtime-auto;
+	disable-rx;
 };

samples/boards/nordic/system_off/prj.conf

@@ -3,7 +3,6 @@ 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

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

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

@@ -14,23 +14,11 @@
 int main(void)
 {
 
-
 	if (IS_ENABLED(CONFIG_CONSOLE)) {
 		printf("%s system off demo. Ready for system off.\n", CONFIG_BOARD);
 	}
 
-	z_nrf_grtc_wakeup_prepare(1000);
-
-	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

@@ -29,6 +29,7 @@
 #endif
 #if defined(CONFIG_GPIO_WAKEUP_ENABLE)
 static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
+static const uint32_t port_sw0 = DT_PROP(DT_GPIO_CTLR_BY_IDX(DT_ALIAS(sw0), gpios, 0), port);
 #endif
 #if defined(CONFIG_LPCOMP_WAKEUP_ENABLE)
 static const struct device *comp_dev = DEVICE_DT_GET(DT_NODELABEL(comp));
@@ -65,32 +66,38 @@ int main(void)
 {
 	int rc;
 	uint32_t reset_cause;
-	const struct device *const cons = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 	uint32_t nrf_pin_sw1 = 32 * port_sw1 + sw1.pin;
 	bool do_poweroff = true;
 
-	if (!device_is_ready(cons)) {
-		printf("%s: device not ready.\n", cons->name);
-		return 0;
+	if (nrf_gpio_pin_latch_get(nrf_pin_sw1)) {
+		nrf_gpio_pin_latch_clear(nrf_pin_sw1);
+#if defined(CONFIG_SOC_NRF54H20)
+		/* Set gpio default if sense is set, prevent 300uA additional current after wakeup
+		 * This is only needed for nrf54 series as PIN config is different from PAD config.
+		 * After wakeup from system-off, SENSE bit is not reset but INPUT is.
+		 */
+		if (nrf_gpio_pin_sense_get(nrf_pin_sw1) != GPIO_PIN_CNF_SENSE_Disabled) {
+			nrf_gpio_cfg_default(nrf_pin_sw1);
+		}
+#endif
+		do_poweroff = false;
 	}
 
-	/* TODO: this is always set and locks entering power off after gpio wakeup */
-	// if (nrf_gpio_pin_latch_get(nrf_pin_sw1)) {
-	// 	nrf_gpio_pin_latch_clear(nrf_pin_sw1);
-	// 	do_poweroff = false;
-	// }
-
 	printf("\n%s system off demo\n", CONFIG_BOARD);
 	hwinfo_get_reset_cause(&reset_cause);
 	rc = print_reset_cause(reset_cause);
 
-#if defined(CONFIG_SOC_NRF54H20_CPUAPP)
-/* Temporary set gpio default if sense is set, prevent 300uA additional current after wakeup */
-	for (int i = 0; i < 12; i++) {
-		if (nrf_gpio_pin_sense_get(i) != GPIO_PIN_CNF_SENSE_Disabled) {
-			nrf_gpio_cfg_default(i);
-		}
+#if defined(CONFIG_SOC_NRF54H20)
+#if defined(CONFIG_GPIO_WAKEUP_ENABLE)
+	/* Set gpio default if sense is set, prevent 300uA additional current after wakeup
+	 * This is only needed for nrf54 series as PIN config is different from PAD config.
+	 * After wakeup from system-off, SENSE bit is not reset but INPUT is.
+	 */
+	uint32_t nrf_pin_sw0 = 32 * port_sw0 + sw0.pin;
+	if(nrf_gpio_pin_sense_get(nrf_pin_sw0) != GPIO_PIN_CNF_SENSE_Disabled) {
+		nrf_gpio_cfg_default(nrf_pin_sw0);
 	}
+#endif
 #endif
 
 	if (rc < 0) {
@@ -120,10 +127,10 @@ int main(void)
 		printf("Retained data not supported\n");
 	}
 
-
 	k_sleep(K_MSEC(4000));
 
 #if defined(CONFIG_GRTC_WAKEUP_ENABLE)
+
 	int err = z_nrf_grtc_wakeup_prepare(DEEP_SLEEP_TIME_S * USEC_PER_SEC);
 
 	if (err < 0) {
@@ -145,6 +152,10 @@ int main(void)
 		printf("Could not configure sw0 GPIO interrupt (%d)\n", rc);
 		return 0;
 	}
+
+#if defined(CONFIG_SOC_NRF54H20)
+	nrf_gpio_pin_retain_disable(nrf_pin_sw0);
+#endif
 #endif
 #if defined(CONFIG_LPCOMP_WAKEUP_ENABLE)
 	comparator_set_trigger(comp_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
@@ -163,16 +174,26 @@ int main(void)
 		return 0;
 	}
 
+#if defined(CONFIG_SOC_NRF54H20)
+	nrf_gpio_pin_retain_disable(nrf_pin_sw1);
+#endif
+
 	if (do_poweroff) {
 		printf("Entering system off; press sw0 or sw1 to restart\n");
 	} else {
 		printf("Button sw1 pressed, not entering system off\n");
 	}
 
-	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_PM_DEVICE) && IS_ENABLED(CONFIG_SERIAL)) {
+		static const struct device *dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+		int err;
+		enum pm_device_state state;
+
+		if (dev) {
+			do {
+				err = pm_device_state_get(dev, &state);
+			} while ((err == 0) && (state == PM_DEVICE_STATE_ACTIVE));
+		}
 	}
 
 	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {