Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'thermal-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki:
"These enable a new hardware feature in the int340x thermal driver and
fix up comments in the thermal core code:
- Set a feature flag in the int340x thermal driver to enable the
power slider interface for Wildcat Lake processors (Srinivas
Pandruvada)
- Fix typo and indentation in comments in the thermal core (Thorsten
Blum)"
* tag 'thermal-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: core: Fix typo and indentation in comments
thermal: intel: int340x: Enable power slider interface for Wildcat Lake
+4
-3
+2
-1
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+2
-1
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
···
503
503
{ PCI_DEVICE_DATA(INTEL, WCL_THERMAL, PROC_THERMAL_FEATURE_MSI_SUPPORT |
504
504
PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_DLVR |
505
505
PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_WT_HINT |
506
-
PROC_THERMAL_FEATURE_POWER_FLOOR | PROC_THERMAL_FEATURE_PTC) },
506
+
PROC_THERMAL_FEATURE_POWER_FLOOR | PROC_THERMAL_FEATURE_PTC |
507
+
PROC_THERMAL_FEATURE_SOC_POWER_SLIDER) },
507
508
{ PCI_DEVICE_DATA(INTEL, NVL_H_THERMAL, PROC_THERMAL_FEATURE_RAPL |
508
509
PROC_THERMAL_FEATURE_DLVR | PROC_THERMAL_FEATURE_DVFS |
509
510
PROC_THERMAL_FEATURE_MSI_SUPPORT | PROC_THERMAL_FEATURE_WT_HINT |
+2
-2
drivers/thermal/thermal_core.c
+2
-2
drivers/thermal/thermal_core.c
···
500
500
WRITE_ONCE(trip->hysteresis, hyst);
501
501
thermal_notify_tz_trip_change(tz, trip);
502
502
/*
503
-
* If the zone temperature is above or at the trip tmperature, the trip
503
+
* If the zone temperature is above or at the trip temperature, the trip
504
504
* is in the trips_reached list and its threshold is equal to its low
505
505
* temperature. It needs to stay in that list, but its threshold needs
506
506
* to be updated and the list ordering may need to be restored.
···
1043
1043
* @np: a pointer to a device tree node.
1044
1044
* @type: the thermal cooling device type.
1045
1045
* @devdata: device private data.
1046
-
* @ops: standard thermal cooling devices callbacks.
1046
+
* @ops: standard thermal cooling devices callbacks.
1047
1047
*
1048
1048
* This interface function adds a new thermal cooling device (fan/processor/...)
1049
1049
* to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself