Merge branches 'pm-opp', 'pm-devfreq' and 'powercap'
Merge an operating performance points (OPP) update, devfreq updates and power capping updates for 5.17-rc1: - Update outdated OPP documentation (Tang Yizhou). - Reduce log severity for informative message regarding frequency transition failures in devfreq (Tzung-Bi Shih). - Add DRAM frequency controller devfreq driver for Allwinner sunXi SoCs (Samuel Holland). - Add missing COMMON_CLK dependency to the sun8i devfreq driver (Arnd Bergmann). - Add support for new layout of Psys PowerLimit Register on SPR to the Intel RAPL power capping driver (Zhang Rui). - Fix typo in a comment in idle_inject.c (Jason Wang). - Remove unused function definition from the DTPM (Dynamit Thermal Power Management) power capping framework (Daniel Lezcano). - Reduce DTPM trace verbosity (Daniel Lezcano). * pm-opp: Documentation: power: Update outdated contents in opp.rst * pm-devfreq: PM / devfreq: Reduce log severity for informative message PM / devfreq: sun8i: addd COMMON_CLK dependency PM / devfreq: Add a driver for the sun8i/sun50i MBUS * powercap: powercap/drivers/dtpm: Reduce trace verbosity powercap/drivers/dtpm: Remove unused function definition powercap: fix typo in a comment in idle_inject.c powercap: intel_rapl: support new layout of Psys PowerLimit Register on SPR
This commit is contained in:
commit
78e6e4dfd8
10 changed files with 599 additions and 17 deletions
|
|
@ -70,6 +70,4 @@ void dtpm_unregister(struct dtpm *dtpm);
|
|||
|
||||
int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent);
|
||||
|
||||
int dtpm_register_cpu(struct dtpm *parent);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -58,6 +58,12 @@ enum rapl_primitives {
|
|||
THROTTLED_TIME,
|
||||
PRIORITY_LEVEL,
|
||||
|
||||
PSYS_POWER_LIMIT1,
|
||||
PSYS_POWER_LIMIT2,
|
||||
PSYS_PL1_ENABLE,
|
||||
PSYS_PL2_ENABLE,
|
||||
PSYS_TIME_WINDOW1,
|
||||
PSYS_TIME_WINDOW2,
|
||||
/* below are not raw primitive data */
|
||||
AVERAGE_POWER,
|
||||
NR_RAPL_PRIMITIVES,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue