diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-10 18:34:02 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-10 18:34:02 +0200 |
| commit | f7e6b99f22f22f3630139aeaeecb83d77e47bf9b (patch) | |
| tree | ded7afb45567f98080d976ba3fbdc4042f0ee6c0 | |
| parent | cf4e0f8a396e42144d4b984ade8735621db5c20e (diff) | |
| parent | 129b60c957711a20434f4d4404652f0720e1ba1d (diff) | |
| parent | 34e1ed189fab1b7533befb266b96051104c1deb6 (diff) | |
Merge branches 'pm-domains' and 'pm-core'pm-6.1-rc1-2
Merge additional generic power domains handling update and an
improvement of the PM callback definition macros for 6.1-rc1:
- Add an error message to be printed when a power domain marked as
"always on" is not actually on during initialization (Johan Hovold).
- Extend macros used for defining power management callbacks to allow
conditional exporting of noirq and late/early suspend/resume PM
callbacks (Paul Cercueil).
* pm-domains:
PM: domains: log failures to register always-on domains
* pm-core:
PM: Improve EXPORT_*_DEV_PM_OPS macros