summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-05-23 20:32:58 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-05-23 20:32:58 +0200
commitbbb544f3349197d1e7f4f9b921b75e919cd45f39 (patch)
tree19540496353e2c3ab729c2a2611e735c0790207c /drivers
parent388292df27810a01c3f459533578255bbba4a4de (diff)
parent7acc8a2ac0c0a87a94950f802a292aa40e866d9d (diff)
parentbd30d075eedce159fd5a42e772b903facaa3c47c (diff)
parentb947769b8f778db130aad834257fcaca25df2edc (diff)
downloadlinux-bbb544f3349197d1e7f4f9b921b75e919cd45f39.tar.gz
Merge branches 'thermal-int340x', 'thermal-pch' and 'thermal-misc'
Merge int340x thermal driver updates, PCH thermal driver updates and
miscellaneous thermal control updates for 5.19-rc1:

 - Clean up _OSC handling in int340x (Davidlohr Bueso).

 - Improve overheat condition handling during suspend-to-idle in the
   Intel PCH thermal driver (Zhang Rui).

 - Use local ops instead of global ops in devfreq_cooling (Kant Fan).

 - Switch hisi_termal from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
   (Hesham Almatary)

* thermal-int340x:
  thermal: int340x: Clean up _OSC context init
  thermal: int340x: Consolidate freeing of acpi_buffer pointer
  thermal: int340x: Clean up unnecessary acpi_buffer pointer freeing

* thermal-pch:
  thermal: intel: pch: improve the cooling delay log
  thermal: intel: pch: enhance overheat handling
  thermal: intel: pch: move cooling delay to suspend_noirq phase
  PM: wakeup: expose pm_wakeup_pending to modules

* thermal-misc:
  thermal: devfreq_cooling: use local ops instead of global ops
  thermal: hisi_termal: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()