Commit 6bdfb259 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more thermal control updates from Rafael Wysocki:
 "Add device IDs for Raptor Lake to the int340x thermal control driver
  (Srinivas Pandruvada)"

* tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: int340x: Add Raptor Lake PCI device id
  thermal: int340x: Support Raptor Lake
parents 71f1b916 e5b54867

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ static const struct acpi_device_id int3400_thermal_match[] = { 
	{"INT3400", 0},

	{"INTC1040", 0},

	{"INTC1041", 0},

	{"INTC10A0", 0},

	{}

};

drivers/thermal/intel/int340x_thermal/int3403_thermal.c

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ static const struct acpi_device_id int3403_device_ids[] = { 
	{"INT3403", 0},

	{"INTC1043", 0},

	{"INTC1046", 0},

	{"INTC10A1", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, int3403_device_ids);

drivers/thermal/intel/int340x_thermal/processor_thermal_device.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define PCI_DEVICE_ID_INTEL_HSB_THERMAL	0x0A03

#define PCI_DEVICE_ID_INTEL_ICL_THERMAL	0x8a03

#define PCI_DEVICE_ID_INTEL_JSL_THERMAL	0x4E03

#define PCI_DEVICE_ID_INTEL_RPL_THERMAL	0xA71D

#define PCI_DEVICE_ID_INTEL_SKL_THERMAL	0x1903

#define PCI_DEVICE_ID_INTEL_TGL_THERMAL	0x9A03

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static SIMPLE_DEV_PM_OPS(proc_thermal_pci_pm, proc_thermal_pci_suspend, 


static const struct pci_device_id proc_thermal_pci_ids[] = {

	{ PCI_DEVICE_DATA(INTEL, ADL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },

	{ PCI_DEVICE_DATA(INTEL, RPL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },

	{ },

};