Commit 3a47fbdd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-intel' 

Merge updates of Intel thermal drivers for v6.10:

 - Add missing MODULE_DESCRIPTION() to multiple files in the
   int340x_thermal and intel_soc_dts_iosf drivers (Srinivas Pandruvada).

 - Adjust the update delay and capabilities-per-event values in the
   Intel HFI thermal driver to prevent it from missing events and allow
   it to process more data in one go (Ricardo Neri).

* thermal-intel:
  thermal: intel: hfi: Increase the number of CPU capabilities per netlink event
  thermal: intel: hfi: Rename HFI_MAX_THERM_NOTIFY_COUNT
  thermal: intel: hfi: Shorten the thermal netlink event delay to 100ms
  thermal: intel: hfi: Rename HFI_UPDATE_INTERVAL
  thermal: intel: Add missing module description
parents 9396b2a6 608fa852

drivers/thermal/intel/int340x_thermal/processor_thermal_mbox.c

+1 −0
Original line number Diff line number Diff line
@@ -156,3 +156,4 @@ int processor_thermal_mbox_interrupt_config(struct pci_dev *pdev, bool enable, 
EXPORT_SYMBOL_NS_GPL(processor_thermal_mbox_interrupt_config, INT340X_THERMAL);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Processor Thermal Mail Box Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_power_floor.c

+1 −0
Original line number Diff line number Diff line
@@ -124,3 +124,4 @@ EXPORT_SYMBOL_NS_GPL(proc_thermal_power_floor_intr_callback, INT340X_THERMAL); 


MODULE_IMPORT_NS(INT340X_THERMAL);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Processor Thermal power floor notification Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c

+1 −0
Original line number Diff line number Diff line
@@ -133,3 +133,4 @@ void proc_thermal_rapl_remove(void) 
EXPORT_SYMBOL_GPL(proc_thermal_rapl_remove);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("RAPL interface using MMIO");

drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c

+1 −0
Original line number Diff line number Diff line
@@ -384,3 +384,4 @@ void proc_thermal_rfim_remove(struct pci_dev *pdev) 
EXPORT_SYMBOL_GPL(proc_thermal_rfim_remove);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Processor Thermal RFIM Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_wt_hint.c

+1 −0
Original line number Diff line number Diff line
@@ -253,3 +253,4 @@ EXPORT_SYMBOL_NS_GPL(proc_thermal_wt_hint_remove, INT340X_THERMAL); 


MODULE_IMPORT_NS(INT340X_THERMAL);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Processor Thermal Work Load type hint Interface");