From 83ef273ea17c6a7f717de384d1bd419aa7ceee78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Thu, 17 Jul 2025 15:04:14 +0200 Subject: [PATCH 1/2] drivers: pinctrl: Allow keeping pinctrl sleep state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When PM or PM_DEVICE is enabled pinctrl sleep state is using for device suspension. However, there are cases where power management is not used but we still want to be able to put pins to sleep state, e.g. device deinit. Signed-off-by: Krzysztof Chruściński --- drivers/pinctrl/Kconfig | 4 ++++ include/zephyr/drivers/pinctrl.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index e13c4e427ff7..8f21bf6f4bcf 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -34,6 +34,10 @@ config PINCTRL_DYNAMIC runtime. This can be useful, for example, to change the pins assigned to a peripheral at early boot stages depending on a certain input. +config PINCTRL_KEEP_SLEEP_STATE + bool "Keep sleep state" + default y if PM || PM_DEVICE + source "drivers/pinctrl/Kconfig.b91" source "drivers/pinctrl/Kconfig.bflb" source "drivers/pinctrl/Kconfig.ambiq" diff --git a/include/zephyr/drivers/pinctrl.h b/include/zephyr/drivers/pinctrl.h index cfababd11490..de36288f451c 100644 --- a/include/zephyr/drivers/pinctrl.h +++ b/include/zephyr/drivers/pinctrl.h @@ -78,7 +78,7 @@ struct pinctrl_dev_config { /** @cond INTERNAL_HIDDEN */ -#if !defined(CONFIG_PM) && !defined(CONFIG_PM_DEVICE) +#if !defined(CONFIG_PINCTRL_KEEP_SLEEP_STATE) /** Out of power management configurations, ignore "sleep" state. */ #define PINCTRL_SKIP_SLEEP 1 #endif From 2b26816bdbbfb2460a4dc571b396305244f1c62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Thu, 17 Jul 2025 16:03:54 +0200 Subject: [PATCH 2/2] drivers: serial: nrfx_uarte: Add support for device deinit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add device deinit function. Support is optional as it is not widely used and it enables pinctrl sleep state so it impacts memory footprint. Signed-off-by: Krzysztof Chruściński --- drivers/serial/Kconfig.nrfx | 7 +++++++ drivers/serial/uart_nrfx_uarte.c | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx index f91980c058b5..622893344023 100644 --- a/drivers/serial/Kconfig.nrfx +++ b/drivers/serial/Kconfig.nrfx @@ -43,6 +43,13 @@ config UART_NRFX_UARTE_NO_IRQ When enabled, then interrupt handler is not used at all and it is possible to get to the lowest power state after uart_poll_out if receiver is not used. +config UART_NRFX_UARTE_DEINIT + bool "Support deinit" + depends on UART_NRFX_UARTE + imply PINCTRL_KEEP_SLEEP_STATE + help + When enabled then UART driver support device_deinit. + config UART_NRFX_UARTE_LEGACY_SHIM bool "Legacy UARTE shim" depends on UART_NRFX_UARTE diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index 46c5a8b83d2e..123ca1537f93 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -2521,6 +2521,22 @@ static int uarte_instance_init(const struct device *dev, return pm_device_driver_init(dev, uarte_nrfx_pm_action); } +static int uarte_instance_deinit(const struct device *dev) +{ + if (IS_ENABLED(CONFIG_PM_DEVICE)) { + enum pm_device_state state; + + /* PM must have suspended the device before driver can be deinitialized. */ + (void)pm_device_state_get(dev, &state); + return (state == PM_DEVICE_STATE_SUSPENDED) || (state == PM_DEVICE_STATE_OFF) ? + 0 : -EBUSY; + } + + uarte_pm_suspend(dev); + + return 0; +} + #define UARTE_GET_ISR(idx) \ COND_CODE_1(CONFIG_UART_##idx##_ASYNC, (uarte_nrfx_isr_async), (uarte_nrfx_isr_int)) @@ -2706,8 +2722,10 @@ static int uarte_instance_init(const struct device *dev, PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action, \ UARTE_PM_ISR_SAFE(idx)); \ \ - DEVICE_DT_DEFINE(UARTE(idx), \ + DEVICE_DT_DEINIT_DEFINE(UARTE(idx), \ uarte_##idx##_init, \ + IS_ENABLED(CONFIG_UART_NRFX_UARTE_DEINIT) ? \ + uarte_instance_deinit : NULL, \ PM_DEVICE_DT_GET(UARTE(idx)), \ &uarte_##idx##_data, \ &uarte_##idx##z_config, \