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

Commit 48628e40 authored by Zhang Rui's avatar Zhang Rui
Browse files

ACPI/int340x_thermal: enumerate INT340X devices even if they're not in _ART/_TRT 



For some INT340X thermal devices, even if they are not referred in
_TRT/_ART table, they still can be used by userspace for thermal control.
Thus change the code to enumerated all the INT340X devices,
no matter if they're referred in _TRT/_ART or not.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
parent 693a30b8

drivers/acpi/int340x_thermal.c

+2 −4
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 


#include "internal.h"



#define DO_ENUMERATION 0x01

static const struct acpi_device_id int340x_thermal_device_ids[] = {

	{"INT3400", DO_ENUMERATION },

	{"INT3400"},

	{"INT3401"},

	{"INT3402"},

	{"INT3403"},
@@ -34,7 +33,6 @@ static int int340x_thermal_handler_attach(struct acpi_device *adev, 
					const struct acpi_device_id *id)

{

#if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE)

	if (id->driver_data == DO_ENUMERATION)

	acpi_create_platform_device(adev);

#endif

	return 1;

drivers/thermal/int340x_thermal/acpi_thermal_rel.c

+4 −12
Original line number Diff line number Diff line
@@ -119,15 +119,11 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp, 
			continue;



		result = acpi_bus_get_device(trt->source, &adev);

		if (!result)

			acpi_create_platform_device(adev);

		else

		if (result)

			pr_warn("Failed to get source ACPI device\n");



		result = acpi_bus_get_device(trt->target, &adev);

		if (!result)

			acpi_create_platform_device(adev);

		else

		if (result)

			pr_warn("Failed to get target ACPI device\n");

	}
@@ -206,16 +202,12 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp, 


		if (art->source) {

			result = acpi_bus_get_device(art->source, &adev);

			if (!result)

				acpi_create_platform_device(adev);

			else

			if (result)

				pr_warn("Failed to get source ACPI device\n");

		}

		if (art->target) {

			result = acpi_bus_get_device(art->target, &adev);

			if (!result)

				acpi_create_platform_device(adev);

			else

			if (result)

				pr_warn("Failed to get source ACPI device\n");

		}

	}