summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-05-13 20:19:58 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-05-13 20:19:58 +0200
commitde1c2722e07819c7ea65bb4bf37a2cfe2556095b (patch)
treef7e432a30730544f612c7e9ed1c55ad6a41dcdcf /kernel
parent440f9d47dfac065a8da663adbc4b28703fdf550e (diff)
parenta5bb5e0877dee3595037eb8767b6bed047c898a5 (diff)
parenteb68d909d53eed0ec9722fcb18747647ca33a18f (diff)
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