openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branches 'thermal-core' and 'thermal-intel' into next

This commit is contained in:
Zhang Rui 2019-06-28 09:15:17 +08:00
parent 6bbe6f5732 aaba9791fb
commit ff9b011ad1
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
View File

@ -443,6 +443,18 @@ static void proc_thermal_pci_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
static int proc_thermal_resume(struct device *dev)
{
struct proc_thermal_device *proc_dev;
proc_dev = dev_get_drvdata(dev);
proc_thermal_read_ppcc(proc_dev);
return 0;
}
static SIMPLE_DEV_PM_OPS(proc_thermal_pm, NULL, proc_thermal_resume);
static const struct pci_device_id proc_thermal_pci_ids[] = { static const struct pci_device_id proc_thermal_pci_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BDW_THERMAL)}, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BDW_THERMAL)},
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_HSB_THERMAL)}, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_HSB_THERMAL)},
@ -465,6 +477,7 @@ static struct pci_driver proc_thermal_pci_driver = {
.probe = proc_thermal_pci_probe, .probe = proc_thermal_pci_probe,
.remove = proc_thermal_pci_remove, .remove = proc_thermal_pci_remove,
.id_table = proc_thermal_pci_ids, .id_table = proc_thermal_pci_ids,
.driver.pm = &proc_thermal_pm,
}; };
static const struct acpi_device_id int3401_device_ids[] = { static const struct acpi_device_id int3401_device_ids[] = {
@ -479,6 +492,7 @@ static struct platform_driver int3401_driver = {
.driver = { .driver = {
.name = "int3401 thermal", .name = "int3401 thermal",
.acpi_match_table = int3401_device_ids, .acpi_match_table = int3401_device_ids,
.pm = &proc_thermal_pm,
}, },
}; };