From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 3 Aug 2020 11:11:39 +0000 (+0200)
Subject: Merge branches 'pm-em' and 'pm-core'
X-Git-Tag: block-5.9-2020-08-14~45^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5b5642075c317e67ea342a2fb8023a8e754a5002;p=linux-2.6-block.git

Merge branches 'pm-em' and 'pm-core'

* pm-em:
  OPP: refactor dev_pm_opp_of_register_em() and update related drivers
  Documentation: power: update Energy Model description
  PM / EM: change name of em_pd_energy to em_cpu_energy
  PM / EM: remove em_register_perf_domain
  PM / EM: add support for other devices than CPUs in Energy Model
  PM / EM: update callback structure and add device pointer
  PM / EM: introduce em_dev_register_perf_domain function
  PM / EM: change naming convention from 'capacity' to 'performance'

* pm-core:
  mmc: jz4740: Use pm_ptr() macro
  PM: Make *_DEV_PM_OPS macros use __maybe_unused
  PM: core: introduce pm_ptr() macro
---

5b5642075c317e67ea342a2fb8023a8e754a5002