1bfcc1ea8a
Brings lots of driver updates and API changes needed for mt76 updates. Disable iwlwifi and ath11k on 5.15, since backport is too difficult, and the only remaining targets won't need those drivers. Signed-off-by: Felix Fietkau <nbd@nbd.name>
27 lines
957 B
Diff
27 lines
957 B
Diff
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
|
|
@@ -689,13 +689,23 @@ static void iwl_mvm_thermal_zone_registe
|
|
for (i = 0 ; i < IWL_MAX_DTS_TRIPS; i++) {
|
|
mvm->tz_device.trips[i].temperature = THERMAL_TEMP_INVALID;
|
|
mvm->tz_device.trips[i].type = THERMAL_TRIP_PASSIVE;
|
|
+#if LINUX_VERSION_IS_GEQ(6,9,0)
|
|
mvm->tz_device.trips[i].flags = THERMAL_TRIP_FLAG_RW_TEMP;
|
|
+#endif
|
|
}
|
|
+#if LINUX_VERSION_IS_GEQ(6,9,0)
|
|
mvm->tz_device.tzone = thermal_zone_device_register_with_trips(name,
|
|
mvm->tz_device.trips,
|
|
IWL_MAX_DTS_TRIPS,
|
|
mvm, &tzone_ops,
|
|
NULL, 0, 0);
|
|
+#else
|
|
+ mvm->tz_device.tzone = thermal_zone_device_register_with_trips(name,
|
|
+ mvm->tz_device.trips,
|
|
+ IWL_MAX_DTS_TRIPS, 0,
|
|
+ mvm, &tzone_ops,
|
|
+ NULL, 0, 0);
|
|
+#endif
|
|
if (IS_ERR(mvm->tz_device.tzone)) {
|
|
IWL_DEBUG_TEMP(mvm,
|
|
"Failed to register to thermal zone (err = %ld)\n",
|