From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 4 Feb 2026 20:06:22 +0000 (+0100)
Subject: Merge branches 'pm-powercap', 'pm-opp' and 'pm-em'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=931688a44a2b1a115cfaa229accb255f890196f3;p=thirdparty%2Flinux.git

Merge branches 'pm-powercap', 'pm-opp' and 'pm-em'

Merge power capping updates, OPP (operating performance points) updates
and energy model management documentation updates for 6.20-rc1/7.0-rc1:

 - Add PL4 support for Ice Lake to the Intel RAPL power capping
   driver (Daniel Tang)

 - Replace sprintf() with sysfs_emit() in power capping sysfs show
   functions (Sumeet Pawnikar)

 - Make dev_pm_opp_get_level() return value match the documentation
   after a previous update of the latter (Aleks Todorov)

 - Use scoped for each OF child loop in the OPP code (Krzysztof
   Kozlowski)

 - Fix a bug in an example code snippet and correct typos in the energy
   model management documentation (Patrick Little)

* pm-powercap:
  powercap: intel_rapl: Add PL4 support for Ice Lake
  powercap: Replace sprintf() with sysfs_emit() in sysfs show functions

* pm-opp:
  OPP: Return correct value in dev_pm_opp_get_level
  OPP: of: Simplify with scoped for each OF child loop

* pm-em:
  PM: EM: Documentation: Fix bug in example code snippet
  Documentation: Fix typos in energy model documentation
---

931688a44a2b1a115cfaa229accb255f890196f3