Skip to content

Commit 32665a9

Browse files
committed
Merge tag 'thermal-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull additional thermal control update from Rafael Wysocki: "Add Meteor Lake PCI device ID to the int340x thermal control driver (Sumeet Pawnikar)" * tag 'thermal-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal: int340x: Add Meteor Lake PCI device ID
2 parents 527953e + 3c1d004 commit 32665a9

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/thermal/intel/int340x_thermal/processor_thermal_device.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#define PCI_DEVICE_ID_INTEL_HSB_THERMAL 0x0A03
2525
#define PCI_DEVICE_ID_INTEL_ICL_THERMAL 0x8a03
2626
#define PCI_DEVICE_ID_INTEL_JSL_THERMAL 0x4E03
27+
#define PCI_DEVICE_ID_INTEL_MTLP_THERMAL 0x7D03
2728
#define PCI_DEVICE_ID_INTEL_RPL_THERMAL 0xA71D
2829
#define PCI_DEVICE_ID_INTEL_SKL_THERMAL 0x1903
2930
#define PCI_DEVICE_ID_INTEL_TGL_THERMAL 0x9A03

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ static SIMPLE_DEV_PM_OPS(proc_thermal_pci_pm, proc_thermal_pci_suspend,
358358

359359
static const struct pci_device_id proc_thermal_pci_ids[] = {
360360
{ PCI_DEVICE_DATA(INTEL, ADL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },
361+
{ PCI_DEVICE_DATA(INTEL, MTLP_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },
361362
{ PCI_DEVICE_DATA(INTEL, RPL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },
362363
{ },
363364
};

0 commit comments

Comments
 (0)