[GIT PULL] Power management updates for v5.9-rc5

From: Rafael J. Wysocki
Date: Fri Sep 11 2020 - 12:36:49 EST

Hi Linus,

Please pull from the tag

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git \

with top-most commit d64e6906d188f0ba6a4f82b3f42e0bd0598183fa

Merge branch 'powercap'

on top of commit f4d51dffc6c01a9e94650d95ce0104964f8ae822

Linux 5.9-rc4

to receive power management updates for 5.9-rc5.

These fix three pieces of documentation and add new CPU IDs to the
Intel RAPL power capping driver.


- Add CPU IDs of the TigerLake Desktop, RocketLake and AlderLake
chips to the Intel RAPL power capping driver (Zhang Rui).

- Add the missing energy model performance domain item to the
struct device kerneldoc comment (Randy Dunlap).

- Fix the struct powercap_control_type kerneldoc comment to match
the actual definition of that structure and add missing item to
the struct powercap_zone_ops kerneldoc comment (Amit Kucheria).



Amit Kucheria (1):
powercap: make documentation reflect code

Randy Dunlap (1):
PM: <linux/device.h>: fix @em_pd kernel-doc warning

Zhang Rui (3):
powercap/intel_rapl: add support for TigerLake Desktop
powercap/intel_rapl: add support for RocketLake
powercap/intel_rapl: add support for AlderLake


drivers/powercap/intel_rapl_common.c | 3 +++
include/linux/device.h | 1 +
include/linux/powercap.h | 11 +++++------
3 files changed, 9 insertions(+), 6 deletions(-)