Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ed3ee6 authored by Zhang Rui's avatar Zhang Rui
Browse files

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

parents 7e3c0381 ce7d35fa

drivers/thermal/int340x_thermal/int340x_thermal_zone.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -147,8 +147,8 @@ static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone, 




	status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);

	status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);

	if (ACPI_FAILURE(status))

	if (ACPI_FAILURE(status))

		return -EIO;

		*temp = 0;



	else

		*temp = hyst * 100;

		*temp = hyst * 100;





	return 0;

	return 0;

drivers/thermal/int340x_thermal/processor_thermal_device.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,9 @@ 
#define PCI_DEVICE_ID_PROC_BXTX_THERMAL  0x4A8C

#define PCI_DEVICE_ID_PROC_BXTX_THERMAL  0x4A8C

#define PCI_DEVICE_ID_PROC_BXTP_THERMAL  0x5A8C

#define PCI_DEVICE_ID_PROC_BXTP_THERMAL  0x5A8C





/* GeminiLake thermal reporting device */

#define PCI_DEVICE_ID_PROC_GLK_THERMAL	0x318C



struct power_config {

struct power_config {

	u32	index;

	u32	index;

	u32	min_uw;

	u32	min_uw;
@@ -467,6 +470,7 @@ static const struct pci_device_id proc_thermal_pci_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXTP_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXTP_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CNL_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CNL_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CFL_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CFL_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_GLK_THERMAL)},

	{ 0, },

	{ 0, },

};

};