Skip to content

[drivers][power] add CLI helpers and current control support #11301

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
Evlers wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[drivers][power] add CLI helpers and current control support #11301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79b364f
[drivers][power] add CLI helpers and current control support
Evlers Mar 27, 2026
a226950
[drivers][regulator] initialize record pointer to RT_NULL in find_rec…
Evlers Mar 27, 2026
545c47f
[drivers][power] fix the inline declaration of the function "power_su…
Evlers Mar 27, 2026
754c040
[drivers][power] optimize the command line of power_supply
Evlers Mar 28, 2026
66142af
[drivers][power] remove the redundant function "power_supply_dev_name"
Evlers Mar 29, 2026
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
5 changes: 5 additions & 0 deletions components/drivers/include/drivers/power_supply.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2022-11-21 GuEe-GUI first version
* 2026-03-27 Evlers add snapshot helpers and public name getter
*/

#ifndef __POWER_SUPPLY_H__
Expand Down Expand Up @@ -274,4 +275,8 @@ void rt_power_supply_changed(struct rt_power_supply *psy);
struct rt_power_supply *rt_power_supply_get(struct rt_device *dev, const char *id);
void rt_power_supply_put(struct rt_power_supply *psy);

const char *rt_power_supply_name(struct rt_power_supply *psy);
struct rt_power_supply **rt_power_supply_snapshot(rt_size_t *count);
void rt_power_supply_snapshot_free(struct rt_power_supply **nodes, rt_size_t count);

#endif /* __POWER_SUPPLY_H__ */
30 changes: 30 additions & 0 deletions components/drivers/include/drivers/regulator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2023-09-23 GuEe-GUI first version
* 2026-03-27 Evlers add current control API and snapshot helpers
*/

#ifndef __REGULATOR_H__
Expand All @@ -18,6 +19,7 @@
#include <drivers/misc.h>

#define RT_REGULATOR_UVOLT_INVALID (((int)(RT_UINT32_MAX >> 1)))
#define RT_REGULATOR_UAMP_INVALID (((int)(RT_UINT32_MAX >> 1)))

struct rt_regulator_param
{
Expand Down Expand Up @@ -86,6 +88,8 @@ struct rt_regulator_ops
rt_bool_t (*is_enabled)(struct rt_regulator_node *reg);
rt_err_t (*set_voltage)(struct rt_regulator_node *reg, int min_uvolt, int max_uvolt);
int (*get_voltage)(struct rt_regulator_node *reg);
rt_err_t (*set_current)(struct rt_regulator_node *reg, int min_uamp, int max_uamp);
int (*get_current)(struct rt_regulator_node *reg);
rt_err_t (*set_mode)(struct rt_regulator_node *reg, rt_uint32_t mode);
rt_int32_t (*get_mode)(struct rt_regulator_node *reg);
rt_err_t (*set_ramp_delay)(struct rt_regulator_node *reg, int ramp);
Expand All @@ -98,6 +102,8 @@ struct rt_regulator_notifier;
#define RT_REGULATOR_MSG_DISABLE RT_BIT(1)
#define RT_REGULATOR_MSG_VOLTAGE_CHANGE RT_BIT(2)
#define RT_REGULATOR_MSG_VOLTAGE_CHANGE_ERR RT_BIT(3)
#define RT_REGULATOR_MSG_CURRENT_CHANGE RT_BIT(4)
#define RT_REGULATOR_MSG_CURRENT_CHANGE_ERR RT_BIT(5)

union rt_regulator_notifier_args
{
Expand All @@ -107,6 +113,12 @@ union rt_regulator_notifier_args
int min_uvolt;
int max_uvolt;
};
struct
{
int old_uamp;
int min_uamp;
int max_uamp;
};
};

typedef rt_err_t (*rt_regulator_notifier_callback)(struct rt_regulator_notifier *notifier,
Expand Down Expand Up @@ -140,9 +152,16 @@ rt_bool_t rt_regulator_is_supported_voltage(struct rt_regulator *reg, int min_uv
rt_err_t rt_regulator_set_voltage(struct rt_regulator *reg, int min_uvolt, int max_uvolt);
int rt_regulator_get_voltage(struct rt_regulator *reg);

rt_bool_t rt_regulator_is_supported_current(struct rt_regulator *reg, int min_uamp, int max_uamp);
rt_err_t rt_regulator_set_current(struct rt_regulator *reg, int min_uamp, int max_uamp);
int rt_regulator_get_current(struct rt_regulator *reg);

rt_err_t rt_regulator_set_mode(struct rt_regulator *reg, rt_uint32_t mode);
rt_int32_t rt_regulator_get_mode(struct rt_regulator *reg);

struct rt_regulator_node **rt_regulator_nodes_snapshot(rt_size_t *count);
void rt_regulator_nodes_snapshot_free(struct rt_regulator_node **nodes, rt_size_t count);

rt_inline rt_err_t rt_regulator_set_voltage_triplet(struct rt_regulator *reg,
int min_uvolt, int target_uvolt, int max_uvolt)
{
Expand All @@ -154,4 +173,15 @@ rt_inline rt_err_t rt_regulator_set_voltage_triplet(struct rt_regulator *reg,
return rt_regulator_set_voltage(reg, min_uvolt, max_uvolt);
}

rt_inline rt_err_t rt_regulator_set_current_triplet(struct rt_regulator *reg,
int min_uamp, int target_uamp, int max_uamp)
{
if (!rt_regulator_set_current(reg, target_uamp, max_uamp))
{
return RT_EOK;
}

return rt_regulator_set_current(reg, min_uamp, max_uamp);
}

#endif /* __REGULATOR_H__ */
17 changes: 9 additions & 8 deletions components/drivers/include/rtdevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Date Author Notes
* 2012-01-08 bernard first version.
* 2014-07-12 bernard Add workqueue implementation.
* 2026-03-27 Evlers reorder regulator/power supply headers after DM deps
*/

#ifndef __RT_DEVICE_H__
Expand Down Expand Up @@ -118,10 +119,6 @@ extern "C" {
#endif /* RT_PCI_ENDPOINT */
#endif /* RT_USING_PCI */

#ifdef RT_USING_REGULATOR
#include "drivers/regulator.h"
#endif /* RT_USING_REGULATOR */

#ifdef RT_USING_RESET
#include "drivers/reset.h"
#endif /* RT_USING_RESET */
Expand All @@ -148,15 +145,19 @@ extern "C" {
#include "drivers/hwcache.h"
#endif /* RT_USING_HWCACHE */

#ifdef RT_USING_POWER_SUPPLY
#include "drivers/power_supply.h"
#endif /* RT_USING_POWER_SUPPLY */

#ifdef RT_USING_NVMEM
#include "drivers/nvmem.h"
#endif /* RT_USING_NVMEM */
#endif /* RT_USING_DM */

#ifdef RT_USING_REGULATOR
#include "drivers/regulator.h"
#endif /* RT_USING_REGULATOR */

#ifdef RT_USING_POWER_SUPPLY
#include "drivers/power_supply.h"
#endif /* RT_USING_POWER_SUPPLY */

#ifdef RT_USING_RTC
#include "drivers/dev_rtc.h"
#ifdef RT_USING_ALARM
Expand Down
3 changes: 2 additions & 1 deletion components/drivers/power/supply/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
menuconfig RT_USING_POWER_SUPPLY
bool "Using Power supply class support"
depends on RT_USING_DM
select RT_USING_ADT
select RT_USING_ADT_REF
select RT_USING_SYSTEM_WORKQUEUE
Expand All @@ -27,6 +26,8 @@ config RT_POWER_SUPPLY_EMU
config RT_POWER_SUPPLY_CHARGER_GPIO
bool "GPIO charger"
depends on RT_USING_POWER_SUPPLY
depends on RT_USING_DM
depends on RT_USING_OFW
depends on RT_USING_PIN
default y

Expand Down
2 changes: 1 addition & 1 deletion components/drivers/power/supply/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if not GetDepend(['RT_USING_POWER_SUPPLY']):
cwd = GetCurrentDir()
CPPPATH = [cwd + '/../../include']

src = ['supply.c']
src = ['supply.c', 'supply_cmd.c']

if GetDepend(['RT_POWER_SUPPLY_DAEMON']):
src += ['supply-daemon.c']
Expand Down
5 changes: 5 additions & 0 deletions components/drivers/power/supply/emu-power.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2023-02-25 GuEe-GUI the first version
* 2026-03-27 Evlers allow building without DM by naming parent directly
*/

#include <rtthread.h>
Expand Down Expand Up @@ -299,7 +300,11 @@ static int emu_power_init(void)

rt_memset(ep, 0, sizeof(*ep));

#ifdef RT_USING_DM
rt_dm_dev_set_name(&ep->parent, "emu-power");
#else
ep->parent.parent.name = "emu-power";
Copy link

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

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

[bug/缺陷]: Assigning to rt_object.name is invalid when RT_NAME_MAX > 0

English: In the non-DM path, ep->parent.parent.name = "emu-power"; assigns to struct rt_object::name. When RT_NAME_MAX > 0, name is a char array (include/rtdef.h), so this won’t compile. Please copy the string into the name buffer (e.g., rt_strncpy/rt_snprintf) instead.
中文：在未启用 DM 的分支中，ep->parent.parent.name = "emu-power"; 给 struct rt_object 的 name 成员做了赋值。RT_NAME_MAX > 0 时 name 是 char 数组（见 include/rtdef.h），这里会编译失败。建议改为把字符串拷贝到 name 缓冲区中（例如 rt_strncpy/rt_snprintf）。

Suggested change
ep->parent.parent.name = "emu-power";
rt_snprintf(ep->parent.parent.name,
sizeof(ep->parent.parent.name),
"emu-power");

Copilot uses AI. Check for mistakes.
#endif

ep->battery.dev = &ep->parent,
ep->battery.type = RT_POWER_SUPPLY_TYPE_BATTERY,
Expand Down
11 changes: 6 additions & 5 deletions components/drivers/power/supply/supply-daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2023-02-25 GuEe-GUI the first version
* 2026-03-27 Evlers support builds without DM names and improve logging
*/

#include <rtdevice.h>
Expand Down Expand Up @@ -66,11 +67,11 @@ static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *noti
{
if (full_power)
{
LOG_I("%s: Power is full", rt_dm_dev_get_name(psy->dev));
LOG_I("%s: Power is full", rt_power_supply_name(psy));
}
else
{
LOG_I("%s: Power is sufficient", rt_dm_dev_get_name(psy->dev));
LOG_I("%s: Power is sufficient", rt_power_supply_name(psy));
}
}
}
Expand Down Expand Up @@ -109,12 +110,12 @@ static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *noti
if (!rt_power_supply_get_property(psy, RT_POWER_SUPPLY_PROP_SCOPE, &propval) &&
propval.intval == RT_POWER_SUPPLY_SCOPE_SYSTEM)
{
LOG_E("%s: Power is critical, poweroff now", rt_dm_dev_get_name(psy->dev));
LOG_E("%s: Power is critical, poweroff now", rt_power_supply_name(psy));
rt_hw_cpu_shutdown();
}
} while (0);

LOG_E("%s: Power is critical", rt_dm_dev_get_name(psy->dev));
LOG_E("%s: Power is critical", rt_power_supply_name(psy));
}
else if (propval.intval <= 10)
{
Expand All @@ -136,7 +137,7 @@ static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *noti
pm_sleep_mode = PM_SLEEP_MODE_LIGHT;
rt_pm_run_enter(PM_RUN_MODE_NORMAL_SPEED);
#endif
LOG_W("%s: Power is low", rt_dm_dev_get_name(psy->dev));
LOG_W("%s: Power is low", rt_power_supply_name(psy));
}

#ifdef RT_USING_PM
Expand Down
Loading
Loading