From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 May 2024 18:19:58 +0000 (+0200)
Subject: Merge branches 'pm-em' and 'pm-docs'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=de1c2722e07819c7ea65bb4bf37a2cfe2556095b;p=users%2Fhch%2Fblock.git

Merge branches 'pm-em' and 'pm-docs'

Merge Enery Model update and a power management documentation update for
6.10:

 - Make the Samsung exynos-asv driver update the Energy Model after
   adjusting voltage on top of some preliminary changes of the OPP and
   Enery Model generic code (Lukasz Luba).

 - Remove a reference to a function that has been dropped from the power
   management documentation (Bjorn Helgaas).

* pm-em:
  soc: samsung: exynos-asv: Update Energy Model after adjusting voltage
  PM: EM: Add em_dev_update_chip_binning()
  PM: EM: Refactor em_adjust_new_capacity()
  OPP: OF: Export dev_opp_pm_calc_power() for usage from EM

* pm-docs:
  Documentation: PM: Update platform_pci_wakeup_init() reference
---

de1c2722e07819c7ea65bb4bf37a2cfe2556095b