diff --git a/applications/connectivity_bridge/src/modules/uart_handler.c b/applications/connectivity_bridge/src/modules/uart_handler.c index 391eb6c14628..a347ada8b4c9 100644 --- a/applications/connectivity_bridge/src/modules/uart_handler.c +++ b/applications/connectivity_bridge/src/modules/uart_handler.c @@ -6,8 +6,9 @@ #include #include +#include #include -#include +#include #define MODULE uart_handler #include "module_state_event.h" @@ -39,6 +40,10 @@ static const struct device *devices[] = { #define UART_SET_PM_STATE false #endif +#if UART_SET_PM_STATE +atomic_t device_pm_requested = ATOMIC_INIT(0); +#endif + struct uart_rx_buf { atomic_t ref_counter; size_t len; @@ -231,14 +236,23 @@ static void set_uart_power_state(uint8_t dev_idx, bool active) { #if UART_SET_PM_STATE const struct device *dev = devices[dev_idx]; + const char *action; int err; - enum pm_device_action action; - action = active ? PM_DEVICE_ACTION_RESUME : PM_DEVICE_ACTION_SUSPEND; + if (active) { + if (!atomic_test_and_set_bit(&device_pm_requested, dev_idx)) { + action = "pm_device_runtime_get"; + err = pm_device_runtime_get(dev); + } + } else { + if (atomic_test_and_clear_bit(&device_pm_requested, dev_idx)) { + action = "pm_device_runtime_put"; + err = pm_device_runtime_put(dev); + } + } - err = pm_device_action_run(dev, action); - if ((err < 0) && (err != -EALREADY)) { - LOG_ERR("pm_device_action_run failed: %d", err); + if (err < 0) { + LOG_ERR("%s failed: %d", action, err); } #endif } diff --git a/applications/nrf_desktop/src/hw_interface/wheel.c b/applications/nrf_desktop/src/hw_interface/wheel.c index e124fa5a0772..c0cf8cb428cd 100644 --- a/applications/nrf_desktop/src/hw_interface/wheel.c +++ b/applications/nrf_desktop/src/hw_interface/wheel.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -262,13 +262,13 @@ static int enable_qdec(enum state next_state) int err = 0; - /* QDEC device driver starts in PM_DEVICE_STATE_ACTIVE state. */ - if (state != STATE_DISABLED) { - err = pm_device_action_run(qdec_dev, PM_DEVICE_ACTION_RESUME); + /* QDEC device driver starts in PM_DEVICE_STATE_SUSPENDED state. */ + if (state == STATE_DISABLED) { + err = pm_device_runtime_get(qdec_dev); } if (err) { - LOG_ERR("Cannot resume QDEC"); + LOG_ERR("Cannot get QDEC"); return err; } @@ -304,9 +304,9 @@ static int disable_qdec(enum state next_state) return err; } - err = pm_device_action_run(qdec_dev, PM_DEVICE_ACTION_SUSPEND); + err = pm_device_runtime_put(qdec_dev); if (err) { - LOG_ERR("Cannot suspend QDEC"); + LOG_ERR("Cannot put QDEC"); } else { err = setup_wakeup(); if (!err) { diff --git a/applications/serial_lte_modem/src/slm_at_host.c b/applications/serial_lte_modem/src/slm_at_host.c index 6aed640f8832..bfb70e9ed5ea 100644 --- a/applications/serial_lte_modem/src/slm_at_host.c +++ b/applications/serial_lte_modem/src/slm_at_host.c @@ -19,8 +19,9 @@ #include #include #include -#include +#include #include +#include LOG_MODULE_REGISTER(slm_at_host, CONFIG_SLM_LOG_LEVEL); #define SLM_SYNC_STR "Ready\r\n" @@ -53,11 +54,33 @@ static uint8_t quit_str_partial_match; K_MUTEX_DEFINE(mutex_data); /* Protects the data_rb and quit_str_partial_match. */ static struct k_work raw_send_scheduled_work; +static bool slm_uart_dev_active; /* global functions defined in different files */ int slm_at_init(void); void slm_at_uninit(void); +static int set_uart_dev_power_state(bool active) +{ + int err; + + if ((active && slm_uart_dev_active) || (!active && !slm_uart_dev_active)) { + return 0; + } + + if (active) { + err = pm_device_runtime_get(slm_uart_dev); + } else { + err = pm_device_runtime_put(slm_uart_dev); + } + + if (err == 0) { + slm_uart_dev_active = active; + } + + return err; +} + static enum slm_operation_mode get_slm_mode(void) { enum slm_operation_mode mode; @@ -506,10 +529,7 @@ static int slm_at_send_indicate(const uint8_t *data, size_t len, } if (indicate) { - enum pm_device_state state = PM_DEVICE_STATE_OFF; - - pm_device_state_get(slm_uart_dev, &state); - if (state != PM_DEVICE_STATE_ACTIVE) { + if (!slm_uart_dev_is_active()) { slm_ctrl_pin_indicate(); } } @@ -1006,10 +1026,7 @@ static int at_host_power_off(bool shutting_down) if (!err || shutting_down) { /* Power off UART module */ - err = pm_device_action_run(slm_uart_dev, PM_DEVICE_ACTION_SUSPEND); - if (err == -EALREADY) { - err = 0; - } + err = set_uart_dev_power_state(false); if (err) { LOG_WRN("Failed to suspend UART. (%d)", err); if (!shutting_down) { @@ -1033,9 +1050,9 @@ int slm_at_host_power_off(void) int slm_at_host_power_on(void) { - const int err = pm_device_action_run(slm_uart_dev, PM_DEVICE_ACTION_RESUME); + const int err = set_uart_dev_power_state(true); - if (err && err != -EALREADY) { + if (err) { LOG_ERR("Failed to resume UART. (%d)", err); return err; } @@ -1047,6 +1064,11 @@ int slm_at_host_power_on(void) return 0; } +bool slm_uart_dev_is_active(void) +{ + return slm_uart_dev_active; +} + void slm_at_host_uninit(void) { k_mutex_lock(&mutex_mode, K_FOREVER); diff --git a/applications/serial_lte_modem/src/slm_at_host.h b/applications/serial_lte_modem/src/slm_at_host.h index 34d70a66e505..848e6fe17de3 100644 --- a/applications/serial_lte_modem/src/slm_at_host.h +++ b/applications/serial_lte_modem/src/slm_at_host.h @@ -87,6 +87,9 @@ int slm_at_host_power_off(void); /** @brief Counterpart to @c slm_at_host_power_off(). */ int slm_at_host_power_on(void); +/** Check if UART is active */ +bool slm_uart_dev_is_active(void); + /** * @brief Uninitialize AT host for serial LTE modem */ diff --git a/applications/serial_lte_modem/src/slm_ppp.c b/applications/serial_lte_modem/src/slm_ppp.c index ac071b0f947d..a66165513281 100644 --- a/applications/serial_lte_modem/src/slm_ppp.c +++ b/applications/serial_lte_modem/src/slm_ppp.c @@ -703,7 +703,6 @@ static void ppp_data_passing_thread(void*, void*, void*) { const size_t mtu = net_if_get_mtu(ppp_iface); struct zsock_pollfd fds[PPP_FDS_COUNT]; - enum pm_device_state state = PM_DEVICE_STATE_OFF; for (size_t i = 0; i != ARRAY_SIZE(fds); ++i) { fds[i].fd = ppp_fds[i]; @@ -745,8 +744,7 @@ static void ppp_data_passing_thread(void*, void*, void*) /* When DL data is received from the network, check if UART is suspended */ if (src == MODEM_FD_IDX) { - pm_device_state_get(ppp_uart_dev, &state); - if (state != PM_DEVICE_STATE_ACTIVE) { + if (!slm_uart_dev_is_active()) { LOG_DBG("PPP data received but UART not active"); slm_ctrl_pin_indicate(); } diff --git a/applications/serial_lte_modem/src/slm_uart_handler.c b/applications/serial_lte_modem/src/slm_uart_handler.c index d72b3f092d2b..625315ce840f 100644 --- a/applications/serial_lte_modem/src/slm_uart_handler.c +++ b/applications/serial_lte_modem/src/slm_uart_handler.c @@ -180,10 +180,8 @@ static int tx_start(void) uint8_t *buf; size_t len; int err; - enum pm_device_state state = PM_DEVICE_STATE_OFF; - pm_device_state_get(slm_uart_dev, &state); - if (state != PM_DEVICE_STATE_ACTIVE) { + if (!slm_uart_dev_is_active()) { return 1; } diff --git a/boards/shields/pca63566/boards/nrf54h20dk_nrf54h20_common.dtsi b/boards/shields/pca63566/boards/nrf54h20dk_nrf54h20_common.dtsi index b606bdb56006..57a99fe79836 100644 --- a/boards/shields/pca63566/boards/nrf54h20dk_nrf54h20_common.dtsi +++ b/boards/shields/pca63566/boards/nrf54h20dk_nrf54h20_common.dtsi @@ -55,7 +55,6 @@ pinctrl-1 = <&i2c130_sleep>; pinctrl-names = "default", "sleep"; zephyr,concat-buf-size = <255>; - zephyr,pm-device-runtime-auto; bme688: bme688@76 { compatible = "bosch,bme680"; @@ -83,7 +82,6 @@ pinctrl-1 = <&spi131_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; cs-gpios = <&gpio0 4 GPIO_ACTIVE_LOW>, <&gpio1 2 GPIO_ACTIVE_LOW>; diff --git a/doc/nrf/drivers/mspi_sqspi.rst b/doc/nrf/drivers/mspi_sqspi.rst index 88e493d6f450..45ce35768d74 100644 --- a/doc/nrf/drivers/mspi_sqspi.rst +++ b/doc/nrf/drivers/mspi_sqspi.rst @@ -85,7 +85,6 @@ See the following configuration example for the nRF54L15 SoC: #size-cells = <0>; reg = <0x3c00 0x200>; status = "okay"; - zephyr,pm-device-runtime-auto; }; }; }; @@ -162,7 +161,6 @@ The following example configuration for the nRF54H20 SoC sets up the necessary p #address-cells = <1>; #size-cells = <0>; reg = <0x3e00 0x200>; - zephyr,pm-device-runtime-auto; memory-regions = <&sqspi_buffers>; }; }; diff --git a/dts/common/nordic/nrf54lm20a.dtsi b/dts/common/nordic/nrf54lm20a.dtsi index ce0fbf7b2285..9cfc0088d2e9 100644 --- a/dts/common/nordic/nrf54lm20a.dtsi +++ b/dts/common/nordic/nrf54lm20a.dtsi @@ -322,7 +322,6 @@ interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi20: spi@c6000 { @@ -361,7 +360,6 @@ interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi21: spi@c7000 { @@ -400,7 +398,6 @@ interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi22: spi@c8000 { @@ -535,7 +532,6 @@ interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; #io-channel-cells = <1>; - zephyr,pm-device-runtime-auto; }; nfct: nfct@d6000 { @@ -625,7 +621,6 @@ interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi23: spi@ed000 { @@ -664,7 +659,6 @@ interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi24: spi@ee000 { @@ -715,7 +709,6 @@ interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi30: spi@104000 { diff --git a/dts/common/nordic/nrf54lv10a.dtsi b/dts/common/nordic/nrf54lv10a.dtsi index d98c89dcecf0..c941aa39a904 100644 --- a/dts/common/nordic/nrf54lv10a.dtsi +++ b/dts/common/nordic/nrf54lv10a.dtsi @@ -267,7 +267,6 @@ interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi20: spi@c6000 { @@ -306,7 +305,6 @@ interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi21: spi@c7000 { @@ -400,7 +398,6 @@ interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; #io-channel-cells = <1>; - zephyr,pm-device-runtime-auto; }; temp: temp@d7000 { @@ -457,7 +454,6 @@ interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>; easydma-maxcnt-bits = <16>; status = "disabled"; - zephyr,pm-device-runtime-auto; }; spi30: spi@104000 { diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l05_cpuapp.overlay index 163839989439..70ecd025211c 100644 --- a/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l05_cpuapp.overlay +++ b/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l05_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &button3; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index 163839989439..70ecd025211c 100644 --- a/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &button3; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 163839989439..70ecd025211c 100644 --- a/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/bluetooth/peripheral_power_profiling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &button3; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 7e963dc4f1ce..d8172f8a770c 100644 --- a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &button3; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.overlay b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.overlay index 7e963dc4f1ce..d8172f8a770c 100644 --- a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.overlay +++ b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &button3; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay index ada1632c032f..1d9dce35bfc9 100644 --- a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay +++ b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &button3; &uart30 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/nfc/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/nfc/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay index 0bd4904549c5..09814b66d926 100644 --- a/samples/nfc/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay +++ b/samples/nfc/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay @@ -5,5 +5,4 @@ */ &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/nfc/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/nfc/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index 0bd4904549c5..09814b66d926 100644 --- a/samples/nfc/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/nfc/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -5,5 +5,4 @@ */ &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/nfc/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/nfc/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 7c240e9ccf16..8221c78d7657 100644 --- a/samples/nfc/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/nfc/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,5 +5,4 @@ */ &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/zephyr/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/zephyr/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index e386276074c9..78eed91ac577 100644 --- a/samples/zephyr/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/zephyr/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -63,5 +63,4 @@ }; &uart136 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 4030e1218fd5..f7b634345eb1 100644 --- a/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -59,7 +59,6 @@ overrun-character = <0x00>; cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; wake-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; - zephyr,pm-device-runtime-auto; memory-regions = <&cpurad_dma_region>; spim_dt: spi-device@0 { compatible = "vnd,spi-device"; @@ -69,5 +68,4 @@ }; &uart135 { - zephyr,pm-device-runtime-auto; }; diff --git a/samples/zephyr/drivers/jesd216/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay b/samples/zephyr/drivers/jesd216/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay index d2d131c89070..58b8593d70df 100644 --- a/samples/zephyr/drivers/jesd216/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay +++ b/samples/zephyr/drivers/jesd216/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay @@ -54,7 +54,6 @@ #size-cells = <0>; reg = <0x3c00 0x200>; status = "okay"; - zephyr,pm-device-runtime-auto; }; }; }; diff --git a/samples/zephyr/drivers/spi_flash/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay b/samples/zephyr/drivers/spi_flash/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay index d2d131c89070..58b8593d70df 100644 --- a/samples/zephyr/drivers/spi_flash/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay +++ b/samples/zephyr/drivers/spi_flash/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay @@ -54,7 +54,6 @@ #size-cells = <0>; reg = <0x3c00 0x200>; status = "okay"; - zephyr,pm-device-runtime-auto; }; }; }; diff --git a/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp_pm.overlay b/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp_pm.overlay deleted file mode 100644 index 9c7ae9c523e3..000000000000 --- a/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp_pm.overlay +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (C) 2025 Nordic Semiconductor ASA - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&i2c130 { - /delete-property/ zephyr,pm-device-runtime-auto; -}; diff --git a/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54l15dk_nrf54l15_cpuapp_pm.overlay b/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54l15dk_nrf54l15_cpuapp_pm.overlay deleted file mode 100644 index e992ea8bf734..000000000000 --- a/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54l15dk_nrf54l15_cpuapp_pm.overlay +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (C) 2025 Nordic Semiconductor ASA - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&i2c22 { - /delete-property/ zephyr,pm-device-runtime-auto; -}; diff --git a/tests/benchmarks/current_consumption/twim_suspend/src/main.c b/tests/benchmarks/current_consumption/twim_suspend/src/main.c index ee0ddfafbd69..641f140f28d0 100644 --- a/tests/benchmarks/current_consumption/twim_suspend/src/main.c +++ b/tests/benchmarks/current_consumption/twim_suspend/src/main.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include /* Note: logging is normally disabled for this test * Enable only for debugging purposes @@ -46,19 +46,27 @@ int main(void) printk("Device address 0x%x\n", DEVICE_ADDRESS); printk("I2C speed setting: %d\n", I2C_SPEED_STANDARD); + response = pm_device_runtime_get(i2c_device); + if (response != 0) { + printk("pm_device_runtime_get failed%d\n", response); + __ASSERT_NO_MSG(response == 0); + } + response = i2c_configure(i2c_device, i2c_config); if (response != 0) { printk("I2C configuration failed%d\n", response); __ASSERT_NO_MSG(response == 0); } - response = pm_device_action_run(i2c_device, PM_DEVICE_ACTION_SUSPEND); - printk("PM_DEVICE_ACTION_SUSPEND status: %d\n", response); - __ASSERT_NO_MSG(response == 0); + response = pm_device_runtime_put(i2c_device); + if (response != 0) { + printk("pm_device_runtime_put failed%d\n", response); + __ASSERT_NO_MSG(response == 0); + } while (1) { - response = pm_device_action_run(i2c_device, PM_DEVICE_ACTION_RESUME); - printk("PM_DEVICE_ACTION_RESUME status: %d\n", response); + response = pm_device_runtime_get(i2c_device); + printk("pm_device_runtime_get status: %d\n", response); __ASSERT_NO_MSG(response == 0); response = read_sensor_register(CHIP_ID_REGISTER_ADDRESS); @@ -69,8 +77,8 @@ int main(void) printk("Variant_Id: %d\n", response); __ASSERT_NO_MSG(response != 0); - response = pm_device_action_run(i2c_device, PM_DEVICE_ACTION_SUSPEND); - printk("PM_DEVICE_ACTION_SUSPEND status: %d\n", response); + response = pm_device_runtime_put(i2c_device); + printk("pm_device_runtime_put status: %d\n", response); __ASSERT_NO_MSG(response == 0); printk("Good night\n"); diff --git a/tests/benchmarks/current_consumption/uart_console/src/main.c b/tests/benchmarks/current_consumption/uart_console/src/main.c index cf928a965a1a..48c88a861814 100644 --- a/tests/benchmarks/current_consumption/uart_console/src/main.c +++ b/tests/benchmarks/current_consumption/uart_console/src/main.c @@ -20,8 +20,6 @@ int main(void) *(volatile uint32_t *)0x4007AC84ul = 0x00000002ul; #endif - pm_device_runtime_enable(console_dev); - while (1) { printk("33 characters long string !!!!!!\n"); k_sleep(K_MSEC(SLEEP_TIME_MS)); diff --git a/tests/benchmarks/current_consumption/uarte_suspend/src/main.c b/tests/benchmarks/current_consumption/uarte_suspend/src/main.c index c9c2108e671e..55918b687877 100644 --- a/tests/benchmarks/current_consumption/uarte_suspend/src/main.c +++ b/tests/benchmarks/current_consumption/uarte_suspend/src/main.c @@ -124,10 +124,6 @@ int main(void) __ASSERT_NO_MSG(err == 0); } - if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) { - pm_device_runtime_enable(console_dev); - } - while (1) { printk("Hello\n"); enable_uart_rx(); diff --git a/tests/benchmarks/multicore/idle_comp/src/main.c b/tests/benchmarks/multicore/idle_comp/src/main.c index 9e0c03242687..e658f3ddfde2 100644 --- a/tests/benchmarks/multicore/idle_comp/src/main.c +++ b/tests/benchmarks/multicore/idle_comp/src/main.c @@ -33,7 +33,6 @@ int main(void) rc = gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE); __ASSERT(rc == 0, "Could not configure led GPIO"); - pm_device_runtime_enable(test_dev); pm_device_runtime_get(test_dev); rc = comparator_set_trigger_callback(test_dev, test_callback, NULL); diff --git a/tests/benchmarks/multicore/idle_exmif/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_exmif/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 81fbc2bf09a0..f47a52b3e9c8 100644 --- a/tests/benchmarks/multicore/idle_exmif/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_exmif/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -15,5 +15,4 @@ /delete-node/ &led1; &exmif { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/multicore/idle_ipc/src/main.c b/tests/benchmarks/multicore/idle_ipc/src/main.c index 0b7fc4611da3..2ddcd5b5042e 100644 --- a/tests/benchmarks/multicore/idle_ipc/src/main.c +++ b/tests/benchmarks/multicore/idle_ipc/src/main.c @@ -109,11 +109,6 @@ int main(void) __ASSERT_NO_MSG(ret == 0); } - if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) { - pm_device_runtime_enable(console_dev); - pm_device_runtime_enable(ipc0_instance); - } - ret = k_sem_take(&bound_sem, K_MSEC(IPC_BOUND_TIMEOUT_MS)); if (ret < 0) { printf("k_sem_take() failure (%d)", ret); diff --git a/tests/benchmarks/multicore/idle_pwm_led/src/main.c b/tests/benchmarks/multicore/idle_pwm_led/src/main.c index d68800687a69..19d8de213779 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/src/main.c +++ b/tests/benchmarks/multicore/idle_pwm_led/src/main.c @@ -76,10 +76,6 @@ int main(void) LOG_INF("Core will sleep for %d ms", CONFIG_TEST_SLEEP_DURATION_MS); LOG_INF("Shared memory at %p", (void *) shared_var); -#if defined(CONFIG_PM_DEVICE_RUNTIME) - pm_device_runtime_enable(pwm_led.dev); -#endif - /* Synchronize Remote core with Host core */ #if !defined(CONFIG_TEST_ROLE_REMOTE) LOG_DBG("HOST starts"); diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c b/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c index e178f5b5276c..a4608001e3bd 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c +++ b/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c @@ -147,10 +147,6 @@ int main(void) } __ASSERT_NO_MSG(ret); -#if defined(CONFIG_PM_DEVICE_RUNTIME) - pm_device_runtime_enable(pwm_out.dev); -#endif - /* configure gpio and init GPIOTE callback */ ret = gpio_pin_configure_dt(&pin_in, GPIO_INPUT); if (ret) { diff --git a/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index cf8f0cc76ac3..1a5d727ae569 100644 --- a/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -14,7 +14,6 @@ /delete-node/ &led1; &spi131 { - zephyr,pm-device-runtime-auto; }; &exmif { diff --git a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 8e188b9bd32c..ccc3e32dd678 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -56,7 +56,6 @@ overrun-character = <0x00>; memory-regions = <&cpuapp_dma_region>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index c987cfb5c701..54e5543c0018 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -61,7 +61,6 @@ overrun-character = <0x00>; memory-regions = <&dma_fast_region>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay index 0fcda998bec6..9a40a41156dd 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay +++ b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay @@ -69,7 +69,6 @@ overrun-character = <0x00>; memory-regions = <&dma_fast_region>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index a28617970dc1..70d881e21905 100644 --- a/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -9,5 +9,4 @@ }; &uart136 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/multicore/idle_uarte/src/main.c b/tests/benchmarks/multicore/idle_uarte/src/main.c index 744358f100b3..9e0fe55e1380 100644 --- a/tests/benchmarks/multicore/idle_uarte/src/main.c +++ b/tests/benchmarks/multicore/idle_uarte/src/main.c @@ -157,11 +157,6 @@ int main(void) err = uart_callback_set(uart_dev, async_uart_callback, NULL); __ASSERT(err == 0, "Unexpected error when setting callback %d", err); - if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) { - pm_device_runtime_enable(uart_dev); - pm_device_runtime_enable(console_dev); - } - counter = 0; while (1) { switch_flag = 1; diff --git a/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 84431e9784b0..69734d697275 100644 --- a/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -3,7 +3,6 @@ }; &exmif { - zephyr,pm-device-runtime-auto; }; / { diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 488a3d171bd1..0d459bc80d5d 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -53,7 +53,6 @@ pinctrl-names = "default", "sleep"; steps = <127>; led-pre = <500>; - zephyr,pm-device-runtime-auto; }; /* To prevent enabling console receiver. */ diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 004a3984d9d9..cfd96933c60a 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -50,5 +50,4 @@ pinctrl-names = "default", "sleep"; steps = <127>; led-pre = <500>; - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/benchmarks/power_consumption/qdec/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 6997d156181c..edfac4386035 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -58,5 +58,4 @@ pinctrl-names = "default", "sleep"; steps = <120>; led-pre = <500>; - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index c26046870c8b..2d96e1132efb 100644 --- a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,7 +8,6 @@ /delete-node/ &led1; &spi131 { - zephyr,pm-device-runtime-auto; }; &exmif { diff --git a/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index d36cf6cee96f..3240e50cc879 100644 --- a/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,5 +5,4 @@ }; &spi21 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 9e4a50a3248a..249d59490479 100644 --- a/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,5 +8,4 @@ /delete-node/ &led1; &uart136 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 0e5633f83d64..b186789e5c05 100644 --- a/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,5 +5,4 @@ }; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_async/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_async/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 0a7954e7df62..289e61d2482e 100644 --- a/tests/benchmarks/power_consumption/uart_async/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_async/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -5,5 +5,4 @@ }; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 9e4a50a3248a..249d59490479 100644 --- a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,5 +8,4 @@ /delete-node/ &led1; &uart136 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 0e5633f83d64..b186789e5c05 100644 --- a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,5 +5,4 @@ }; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 0a7954e7df62..289e61d2482e 100644 --- a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -5,5 +5,4 @@ }; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 9e4a50a3248a..249d59490479 100644 --- a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,5 +8,4 @@ /delete-node/ &led1; &uart136 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 0e5633f83d64..b186789e5c05 100644 --- a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,5 +5,4 @@ }; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 0a7954e7df62..289e61d2482e 100644 --- a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -5,5 +5,4 @@ }; &uart20 { - zephyr,pm-device-runtime-auto; }; diff --git a/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay b/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay index 46e361646532..e131fdabdd57 100644 --- a/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay +++ b/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay @@ -141,7 +141,6 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x3e00 0x200>; - zephyr,pm-device-runtime-auto; memory-regions = <&sqspi_buffers>; }; }; diff --git a/tests/drivers/spi/spi_latency/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_latency/boards/nrf52840dk_nrf52840.overlay index 9c8dcfbd0bc8..2c4579b0cb87 100644 --- a/tests/drivers/spi/spi_latency/boards/nrf52840dk_nrf52840.overlay +++ b/tests/drivers/spi/spi_latency/boards/nrf52840dk_nrf52840.overlay @@ -40,7 +40,6 @@ pinctrl-1 = <&dut_spi_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; cs-gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; dut_spi: test-spi-dev@0 { compatible = "vnd,spi-device"; diff --git a/tests/drivers/spi/spi_latency/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/spi/spi_latency/boards/nrf5340dk_nrf5340_cpuapp.overlay index 89daa2872e84..754e975b824a 100644 --- a/tests/drivers/spi/spi_latency/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/tests/drivers/spi/spi_latency/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -40,7 +40,6 @@ pinctrl-1 = <&dut_spi_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; cs-gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; dut_spi: test-spi-dev@0 { compatible = "vnd,spi-device"; diff --git a/tests/drivers/spi/spi_latency/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_latency/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 4ff45135c9f4..497af7851f7e 100644 --- a/tests/drivers/spi/spi_latency/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/spi/spi_latency/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -47,7 +47,6 @@ overrun-character = <0x00>; memory-regions = <&cpuapp_dma_region>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/drivers/spi/spi_latency/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_latency/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 00d35fdc44bb..19d14512fbfa 100644 --- a/tests/drivers/spi/spi_latency/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/spi/spi_latency/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -40,7 +40,6 @@ pinctrl-1 = <&dut_spi_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; cs-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; dut_spi: test-spi-dev@0 { compatible = "vnd,spi-device"; diff --git a/tests/drivers/uart/uart_baudrate_test/boards/nrf54h20dk_nrf54h20_cpuapp_uart120.overlay b/tests/drivers/uart/uart_baudrate_test/boards/nrf54h20dk_nrf54h20_cpuapp_uart120.overlay index ca9c6b67564d..6be13806e125 100644 --- a/tests/drivers/uart/uart_baudrate_test/boards/nrf54h20dk_nrf54h20_cpuapp_uart120.overlay +++ b/tests/drivers/uart/uart_baudrate_test/boards/nrf54h20dk_nrf54h20_cpuapp_uart120.overlay @@ -40,7 +40,6 @@ dut: &uart120 { pinctrl-1 = <&uart120_sleep_alt>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; disable-rx; }; diff --git a/tests/drivers/uart/uart_instances/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/uart/uart_instances/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 05d553eea856..2f4a1d6872fc 100644 --- a/tests/drivers/uart/uart_instances/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/uart/uart_instances/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -150,7 +150,6 @@ pinctrl-1 = <&uart120_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; &dma_fast_region { @@ -164,7 +163,6 @@ pinctrl-1 = <&uart130_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; &uart131 { @@ -174,7 +172,6 @@ pinctrl-1 = <&uart131_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; &uart132 { @@ -184,7 +181,6 @@ pinctrl-1 = <&uart132_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; &uart133 { @@ -194,7 +190,6 @@ pinctrl-1 = <&uart133_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; &uart134 { @@ -204,18 +199,15 @@ pinctrl-1 = <&uart134_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; &uart135 { status = "okay"; memory-regions = < &cpuapp_dma_region >; - zephyr,pm-device-runtime-auto; }; &uart136 { status = "okay"; - zephyr,pm-device-runtime-auto; }; &uart137 { @@ -225,5 +217,4 @@ pinctrl-1 = <&uart137_sleep_test>; pinctrl-names = "default", "sleep"; current-speed = <115200>; - zephyr,pm-device-runtime-auto; }; diff --git a/tests/zephyr/drivers/flash/common/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay b/tests/zephyr/drivers/flash/common/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay index d2d131c89070..58b8593d70df 100644 --- a/tests/zephyr/drivers/flash/common/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay +++ b/tests/zephyr/drivers/flash/common/boards/nrf54l15dk_nrf54l15_cpuapp_sqspi.overlay @@ -54,7 +54,6 @@ #size-cells = <0>; reg = <0x3c00 0x200>; status = "okay"; - zephyr,pm-device-runtime-auto; }; }; }; diff --git a/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay b/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay index d8ca3af05264..a86d3a694b65 100644 --- a/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay +++ b/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay @@ -61,7 +61,6 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay index e62a740238d6..cd82994505dd 100644 --- a/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -53,7 +53,6 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/zephyr/drivers/spi/spi_loopback/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay b/tests/zephyr/drivers/spi/spi_loopback/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay index 56b666e83323..1c9d5ebe2b03 100644 --- a/tests/zephyr/drivers/spi/spi_loopback/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay +++ b/tests/zephyr/drivers/spi/spi_loopback/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay @@ -33,7 +33,6 @@ pinctrl-1 = <&spi21_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 0c093e16b6ef..c13a60949412 100644 --- a/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -29,7 +29,6 @@ pinctrl-1 = <&spi00_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/west.yml b/west.yml index e2703dc6e70f..8e6c8b66a55b 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 72ecd41ad7f33544dbe2e68437a3fe3f7cd8e5ad + revision: pull/3121/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above