summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-08-03 13:11:39 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-08-03 13:11:39 +0200
commit5b5642075c317e67ea342a2fb8023a8e754a5002 (patch)
tree52c8d31bf9de5fd59c02b254096f2a3ee985f1a3 /drivers/thermal
parent9c8cc4d7c4127759eb84ba067b5e749410e2b512 (diff)
parent0e0ffa855d1590e54ec0033404a49e2e57e294fe (diff)
parent02fd86b661794677839fe47faf43ab3a9435e082 (diff)
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