korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

More thermal control updates for 5.17-rc1

Browse Source 
Add device IDs for Raptor Lake to the int340x thermal control
 driver (Srinivas Pandruvada).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmHrB3ASHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxWY4QAIZqImCjrSmgvY+UqzEE+zHWLLek5iiw
 UIfSBk415ug6rQGLAz+Vt4/ZE89HSHs/wT7Yb/wBuT02ilwreRFpdqIuixIq+C6l
 FwDJXYKGLlquKPbfR/HK5bKgYZ/pApjsVwO+cCZSWTpK/FOw88Z57MIiL+D5Vjan
 FJvAGq6vxxQpNUIvzUlPB06T3ISH3HYRQsmWRNVe1xTlcsnZxbvEKXVYPv+QlTuZ
 a6FvjCE5XIQ9/k8OCPt76C8zpoiQ+yz6v43CLZQlLf2IkW9KEFakQBYob0BCPUb2
 1zPe2SabuHQILjTxMkbOt/OEY56Mgcjge7Q+mh+vk64nhqUU2aqfR2IGCxGQ91Jx
 fXvW/jtoH9QBLJ6Gr3QTYkSiHxoJbDqSzX/DaG4Z+nHmk0UKpNAakzNE/n0+DnNA
 BHAgHDwtjvBtJksayIbQpW97t4q+853F4a5cG7NDmx9AtRn0L8e4XIQpdNUhtF+Y
 QUEWGllaIkTcs6LKtiBd6kOe/4CmGqTKC0odAurCRda3ii3iHCYGtDunfGQZHzeY
 +DN/SnBV9DSNANg1eOcL5geDfHqgOtgkqZwzyrPsbC5zIgzNVO8Iwou/9N+4+aiD
 KUrDSxGB4teuu+ePr6MhjjZ3St8raoUShOSkMGlKRXHXrP1IDgssRzHfxChi9jqD
 bfZL6bYMW6bn
 =8J33
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-01-22 10:15:41 +02:00
commit 6bdfb259d6
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/thermal/intel/int340x_thermal/int3400_thermal.c
View File

@ -596,6 +596,7 @@ static const struct acpi_device_id int3400_thermal_match[] = {
{"INT3400", 0},
{"INTC1040", 0},
{"INTC1041", 0},
{"INTC10A0", 0},
{}
};

1
drivers/thermal/intel/int340x_thermal/int3403_thermal.c
View File

@ -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);

1
drivers/thermal/intel/int340x_thermal/processor_thermal_device.h
View File

@ -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

1
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
View File

@ -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) },
{ },
};