diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-12-12 16:31:20 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-12-12 16:31:20 +0100 |
commit | ed6a00471dd444af085164f987e3d5e8145da35a (patch) | |
tree | 150d979ea0d34ef01824e421667ed2266a0d1076 /tools/power | |
parent | Merge branches 'powercap', 'pm-x86', 'pm-opp' and 'pm-misc' (diff) | |
parent | Merge tag 'devfreq-next-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | Merge tag 'linux-cpupower-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | linux-ed6a00471dd444af085164f987e3d5e8145da35a.tar.xz linux-ed6a00471dd444af085164f987e3d5e8145da35a.zip |
Merge branches 'pm-devfreq' and 'pm-tools'
Merge devfreq updates and cpupower utility updates for 6.2-rc1:
- Add a private governor_data for devfreq governors (Kant Fan).
- Reorganize devfreq code to use device_match_of_node() and
devm_platform_get_and_ioremap_resource() instead of open coding
them (ye xingchen, Minghao Chi).
- Make cpupower choose base_cpu to display default cpupower details
instead of picking CPU 0 (Saket Kumar Bhaskar).
- Add Georgian translation to cpupower documentation (Zurab
Kargareteli).
- Introduce powercap intel-rapl library, powercap-info command, and
RAPL monitor into cpupower (Thomas Renninger).
* pm-devfreq:
PM / devfreq: event: use devm_platform_get_and_ioremap_resource()
PM / devfreq: event: Use device_match_of_node()
PM / devfreq: Use device_match_of_node()
PM/devfreq: governor: Add a private governor_data for governor
* pm-tools:
cpupower: rapl monitor - shows the used power consumption in uj for each rapl domain
cpupower: Introduce powercap intel-rapl library and powercap-info command
cpupower: Add Georgian translation
tools/cpupower: Choose base_cpu to display default cpupower details