Skip to content

manifest: sdk-zephyr: Cherry pick remove pm device runtime auto #23607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+82 −150
Open

manifest: sdk-zephyr: Cherry pick remove pm device runtime auto #23607

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
600b0cb
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Jul 31, 2025
e1b647b
remove redundant use of pm_device_runtime_enable()
bjarki-andreasen Jul 31, 2025
848dd41
remove redundant zephyr,pm-device-runtime-auto prop
bjarki-andreasen Jul 31, 2025
4a05846
current_consumption: twim_suspend: refactor to use pm device runtime
bjarki-andreasen Jul 31, 2025
f3bcd32
connectivity_bridge: refactor to use pm device runtime
bjarki-andreasen Jul 31, 2025
c509075
nrf_desktop: refactor to use pm device runtime
bjarki-andreasen Jul 31, 2025
7b5eee4
serial_lte_modem: refactor to use pm_device_runtime
bjarki-andreasen Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions applications/nrf_desktop/src/hw_interface/wheel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <zephyr/device.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/pm/device.h>
#include <zephyr/pm/device_runtime.h>
#include <pinctrl_soc.h>

#include <app_event_manager.h>
Expand Down Expand Up @@ -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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the check here should be removed. Now we should always call pm_device_runtime_get here (also after we return from the suspended state), right?

err = pm_device_runtime_get(qdec_dev);
}

if (err) {
LOG_ERR("Cannot resume QDEC");
LOG_ERR("Cannot get QDEC");
return err;
}

Expand Down Expand Up @@ -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) {
Expand Down