From nobody Thu Oct 2 14:22:15 2025 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1ED72BE7A0 for ; Thu, 2 Oct 2025 11:34:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404852; cv=none; b=MuukxRgL6CQ2tkxlXDl/eGECXUq+Ett8iOfIZMHh115VCQqYtzvDRCi4bYYjK22RxcEWmLjXt4oiB/rQWaOLIBayxKpk7zyyeY4tr4NGsmBCeEkQ/E/PPhEc2rSpPK9uFaOTadOZtWl49c9hrc34BYWBqtQHm3KSquKrk2gCvbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404852; c=relaxed/simple; bh=OSzoS5rtTLi/B+hMV5Q0JgIBDtwwSwS8cCrabNTJlVo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oZklg3nbnBeXHaEVAW+BTpIMwASOY0YHsCASGsncUJ2Aql2oISo09e9POVLvS2BRQHCiLBwBDwFYs63CPF5kobmQ11/UW1znoSbq/VLlTPHy06KosY7oMs+qLLp80aLvK4DkZW91tgLmKuoRViwMKs4NxAzKoRFjRECesI8zBdA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hLlJpLf1; arc=none smtp.client-ip=209.85.208.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hLlJpLf1" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-63798d4b7caso882719a12.3 for ; Thu, 02 Oct 2025 04:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759404847; x=1760009647; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Kt82+dwcyqqy/z3wY/WnDR+0tOJqjHYe0Y3q58yXyz0=; b=hLlJpLf1LBpyxi1QHdOwLXUB0LjIP5F3rOJbd4A+jwmBoL1PdHLmRBg0BYOmbykquh uGDNak7CUUS1dToS5LW3PU+iNWM+twOgH7ITW6xH/AgD3qmgph8H5Gfz+WEK8dHcsECc YHElEXWihUiBuPeeZQNm8CfkYMvQMzHL4bSWp6wMWMSI1Y3FgfSSQuiIRlyGFQ6lwARA 2v4CnCkFuDAnls5n7ehtNmB0x6XRmi+k0zHRcaWRh0ushvU6fbHdCTOLllSbbEYI3QlO JF9tURnRyghVZefw6o97C4EWewyAEoQr7JphNoS5x2mohNwwdUsmx68k150O+gOenYnS c8kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759404847; x=1760009647; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kt82+dwcyqqy/z3wY/WnDR+0tOJqjHYe0Y3q58yXyz0=; b=Nuj3LyYh9OuMFAeJTjzHQ68LFu/4mudawkt3Updja+RdX+Cy8Vl1E2fQvf0Yk4Aqp1 g/QdCi3SX1oJUh87JIO5oPBNdC4YXuB0/AsXGyjWzM3v+GYwYloM6BjcU0hsX1r/PyRU lWfiNvmkQIgETu4uWsXTDx6suMQQmnjng3APM5GlMn/2WYK8vYqcyFYJlOCo8uHwpnhg C9p8g4Lgz7mAf3JsZN7CUj+zui6VYydQJsWj33D0XM19xQHhYY+LGojUn6/KuIel/Eo3 n9dm2PdXMGdcF4NI/lQcrKaI2dnnCT25qkswo/B2t4iA4RrXYSZRlsTXgsGpI1O3y3aQ h22g== X-Forwarded-Encrypted: i=1; AJvYcCXBXYM4jT859IHfYL5fMYCZUikHxSKBLs6WRUKeMD4Mv5wioA2t0V5pSzEjJxHMGwAa/dlDJ+wqhN0bYbI=@vger.kernel.org X-Gm-Message-State: AOJu0YzGJyXmoO6hQNxMDcKS3CiTsIdGUbbaBs2W7okFPyHI11PQTlfw ReYunslBq0ZWczs2A1utTNKsIVyvjYHm1MU5tgJDoGLXPbwlFx589CG+dqUolOQL6Ek8toCURGv Ou/PNjA== X-Google-Smtp-Source: AGHT+IE+4068072UB8enIKGqreBK+V8kMqDIEgu9uXCRHP5CJrH3i0Dac1P6YuynTCl4M7Vi7LVvL4CfTWc= X-Received: from edsf20.prod.google.com ([2002:aa7:d854:0:b0:62f:c143:5d77]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:aa7:c60c:0:b0:634:bc7b:440e with SMTP id 4fb4d7f45d1cf-63678c9f531mr6099293a12.36.1759404847361; Thu, 02 Oct 2025 04:34:07 -0700 (PDT) Date: Thu, 2 Oct 2025 11:33:59 +0000 In-Reply-To: <20251002113404.3117429-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251002113404.3117429-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251002113404.3117429-2-srosek@google.com> Subject: [PATCH v3 1/6] ACPI: DPTF: Ignore SoC DTS thermal while scanning From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Intel SoC DTS thermal driver on Baytrail platform uses IRQ 86 for critical overheating notification. The IRQ 86 is described in the _CRS control method of INT3401 device, thus Intel SoC DTS thermal driver requires INT3401 device to be enumerated. Since dependency on INT3401 device is unrelated to DPTF the IS_ENABLE() macro is removed from ACPI DPTF INT340X scan handler, instead Kconfig is updated to ensure proper enumeration of INT3401 device. Fixes: 014d9d5d0cc1 ("ACPI/int340x_thermal: enumerate INT3401 for Intel SoC= DTS thermal driver") Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/int340x_thermal.c | 7 +------ drivers/thermal/intel/Kconfig | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index a222df059a16..947fe50c2ef6 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -11,10 +11,9 @@ =20 #include "../internal.h" =20 -#define INT3401_DEVICE 0X01 static const struct acpi_device_id int340x_thermal_device_ids[] =3D { {"INT3400"}, - {"INT3401", INT3401_DEVICE}, + {"INT3401"}, {"INT3402"}, {"INT3403"}, {"INT3404"}, @@ -76,10 +75,6 @@ static int int340x_thermal_handler_attach(struct acpi_de= vice *adev, { if (IS_ENABLED(CONFIG_INT340X_THERMAL)) acpi_create_platform_device(adev, NULL); - /* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */ - else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) && - id->driver_data =3D=3D INT3401_DEVICE) - acpi_create_platform_device(adev, NULL); return 1; } =20 diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig index e0268fac7093..f9e275538e29 100644 --- a/drivers/thermal/intel/Kconfig +++ b/drivers/thermal/intel/Kconfig @@ -44,7 +44,8 @@ config INTEL_SOC_DTS_IOSF_CORE =20 config INTEL_SOC_DTS_THERMAL tristate "Intel SoCs DTS thermal driver" - depends on X86 && PCI && ACPI + depends on X86_64 && PCI && ACPI + select INT340X_THERMAL select INTEL_SOC_DTS_IOSF_CORE help Enable this to register Intel SoCs (e.g. Bay Trail) platform digital --=20 2.51.0.618.g983fd99d29-goog From nobody Thu Oct 2 14:22:15 2025 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6596230AACD for ; Thu, 2 Oct 2025 11:34:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404852; cv=none; b=HhPhbW03nvSzWqdVB7E+SJtDmFdWatpvXUBSIiK9fafG+mMi+dZhI5ayJWTkolp71NPBz9jJVwto/CKkOWyOtyQXG4HyuueC87AA67mNLVG+Jqf1OURELnuwhUw1Ort5vsJUgIV7u0TZYmPR/WXCyHH0cZMUylBgJTAjE+HUHLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404852; c=relaxed/simple; bh=J2/RE+wcyjAAKq8EIblB7xOAgS7mLmXhSRoseJOM6qo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CREGrvJHFeI0IYCBK5Y+yM3tyBhxJr017emtSRm4Su8t3Hh9F+yUD6YcPaIi+kTpJb8VlfJZfRlys6beFArXYBasgZYOmjvTFpSLGxn9aiQ6IuCylZigk9O5EtxlCRMNqXciee+ylBrm4d5et4aApkDDJswGrQX2ntuQxwAgiMg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QSTYr0P5; arc=none smtp.client-ip=209.85.208.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QSTYr0P5" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-633958a757fso756401a12.1 for ; Thu, 02 Oct 2025 04:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759404849; x=1760009649; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fmAJYrTmItlTyHOpDg7j/+fR8RNBuEds8SsTFXNa2iU=; b=QSTYr0P5HZbSN7pqnjHEkFLyxFiQ4+fNCy0K9JuUBwv63EMk3LkI75nWCWjraxc8A7 P2/GHAgAkcEG7/DC93OVSB7sSH3puL2iBx249DufolMbGyZkwhZeNuuF1XWNOE5zrPRK oeA6Vex/F1/NgqVsJnKK+aXkMu6uUWwSeXQnht/bZXkq6SQHyHbgdiLCyDApFNZNY86J dIc85OgbP40+TDGKbTZpi3VZr9aJyC8KDyRSMnUWAM/oMOB2vfFoQUkdZHgOfJyqQ2Rg qh6h0hzfgiz4BOlJW213M51G/+bW1cv0H1xCPXXxKELcDqXr0gNm28qHleeuobmubyGr ypkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759404849; x=1760009649; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fmAJYrTmItlTyHOpDg7j/+fR8RNBuEds8SsTFXNa2iU=; b=dZYPWJ/sxcDj3BepNrUOTIGd3cY9fGsPqg/L53NaQzD3ADgHGzFyN0S7iJYfILXBhS fNzykxqFGEhjrTYZYTU4vb5tIFbzLVaa2s4FgKawpvcVXhB/XuAh3iZagNrWoG2SyYQB 4tmCauTmAPUoDD98xwDv48IM9vQrJj+n/FrhWdv/5YrnTxoRH6EVHgybX2QPNYA5xb4E x7uT8HqqYsOwT0ad7j4trqU+iZj6Z39dcgAhd3StFEBIHnu0tdt45ZDyHGXjUqP4szpF owwVYwMVd+y2UbUiZqTfA/Een7Z8lUDg+JngIy5WuHK6Aellb3KfndPg6xT2YTdWFv8W OoCA== X-Forwarded-Encrypted: i=1; AJvYcCXLJVkI2cLQcgXxcDFk5aH8oEFXL1wKH/+dA6qWigGRYgvGxqz0YyenUIvAdlASHCb98Q6gJkkVWM1fILg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywdx2SJAlBnYiN6m4jO9R7mNA8d31ESNjZjOATMMyuACcq1Av0a oES3R+wIWO0TzMpREpPImYTvlQRXCEX9Ewc67/UMbDFiV4n0HyNDxIGXMKN55qIT+rU5k4mb410 1IupAUw== X-Google-Smtp-Source: AGHT+IEVj4vd705hRI1+FyDga0YuwYIHHLD8yvOm22iMxGCDPDnuw0E7JmGDFjmhlbedznVsGfjqhnp3nYU= X-Received: from edsk22.prod.google.com ([2002:aa7:d8d6:0:b0:634:90ba:1f65]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:4409:b0:631:fe26:a661 with SMTP id 4fb4d7f45d1cf-63678bcb6abmr8021731a12.3.1759404848478; Thu, 02 Oct 2025 04:34:08 -0700 (PDT) Date: Thu, 2 Oct 2025 11:34:00 +0000 In-Reply-To: <20251002113404.3117429-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251002113404.3117429-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251002113404.3117429-3-srosek@google.com> Subject: [PATCH v3 2/6] ACPI: DPTF: Move INT340X device IDs to header From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ACPI INT340X device IDs are shared between the DPTF core and thermal drivers, thus they are moved to the common header. Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/dptf_power.c | 18 +---- drivers/acpi/dptf/int340x_thermal.c | 51 +++----------- drivers/acpi/fan.h | 10 +-- drivers/acpi/int340x_thermal.h | 68 +++++++++++++++++++ .../intel/int340x_thermal/int3400_thermal.c | 10 +-- .../intel/int340x_thermal/int3401_thermal.c | 3 +- .../intel/int340x_thermal/int3402_thermal.c | 3 +- .../intel/int340x_thermal/int3403_thermal.c | 10 +-- .../intel/int340x_thermal/int3406_thermal.c | 3 +- 9 files changed, 90 insertions(+), 86 deletions(-) create mode 100644 drivers/acpi/int340x_thermal.h diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c index 776914f31b9e..d7c59f016083 100644 --- a/drivers/acpi/dptf/dptf_power.c +++ b/drivers/acpi/dptf/dptf_power.c @@ -8,6 +8,7 @@ #include #include #include +#include "../int340x_thermal.h" =20 /* * Presentation of attributes which are defined for INT3407 and INT3532. @@ -224,22 +225,7 @@ static void dptf_power_remove(struct platform_device *= pdev) } =20 static const struct acpi_device_id int3407_device_ids[] =3D { - {"INT3407", 0}, - {"INT3532", 0}, - {"INTC1047", 0}, - {"INTC1050", 0}, - {"INTC1060", 0}, - {"INTC1061", 0}, - {"INTC1065", 0}, - {"INTC1066", 0}, - {"INTC106C", 0}, - {"INTC106D", 0}, - {"INTC10A4", 0}, - {"INTC10A5", 0}, - {"INTC10D8", 0}, - {"INTC10D9", 0}, - {"INTC1100", 0}, - {"INTC1101", 0}, + ACPI_INT3407_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3407_device_ids); diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 947fe50c2ef6..43afb6141b98 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -9,63 +9,28 @@ #include #include =20 +#include "../int340x_thermal.h" #include "../internal.h" =20 static const struct acpi_device_id int340x_thermal_device_ids[] =3D { - {"INT3400"}, - {"INT3401"}, - {"INT3402"}, - {"INT3403"}, - {"INT3404"}, - {"INT3406"}, - {"INT3407"}, + ACPI_INT3400_DEVICE_IDS, + ACPI_INT3401_DEVICE_IDS, + ACPI_INT3402_DEVICE_IDS, + ACPI_INT3403_DEVICE_IDS, + ACPI_INT3404_DEVICE_IDS, + ACPI_INT3406_DEVICE_IDS, + ACPI_INT3407_DEVICE_IDS, {"INT3408"}, {"INT3409"}, {"INT340A"}, {"INT340B"}, - {"INT3532"}, - {"INTC1040"}, - {"INTC1041"}, - {"INTC1042"}, - {"INTC1043"}, - {"INTC1044"}, {"INTC1045"}, - {"INTC1046"}, - {"INTC1047"}, - {"INTC1048"}, {"INTC1049"}, - {"INTC1050"}, - {"INTC1060"}, - {"INTC1061"}, - {"INTC1062"}, - {"INTC1063"}, {"INTC1064"}, - {"INTC1065"}, - {"INTC1066"}, - {"INTC1068"}, - {"INTC1069"}, - {"INTC106A"}, {"INTC106B"}, - {"INTC106C"}, - {"INTC106D"}, - {"INTC10A0"}, - {"INTC10A1"}, - {"INTC10A2"}, {"INTC10A3"}, - {"INTC10A4"}, - {"INTC10A5"}, - {"INTC10D4"}, - {"INTC10D5"}, - {"INTC10D6"}, {"INTC10D7"}, - {"INTC10D8"}, - {"INTC10D9"}, - {"INTC10FC"}, - {"INTC10FD"}, - {"INTC10FE"}, {"INTC10FF"}, - {"INTC1100"}, - {"INTC1101"}, {"INTC1102"}, {""}, }; diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h index 8a28a72a7c6a..4015ac56c009 100644 --- a/drivers/acpi/fan.h +++ b/drivers/acpi/fan.h @@ -11,16 +11,10 @@ #define _ACPI_FAN_H_ =20 #include +#include "int340x_thermal.h" =20 #define ACPI_FAN_DEVICE_IDS \ - {"INT3404", }, /* Fan */ \ - {"INTC1044", }, /* Fan for Tiger Lake generation */ \ - {"INTC1048", }, /* Fan for Alder Lake generation */ \ - {"INTC1063", }, /* Fan for Meteor Lake generation */ \ - {"INTC106A", }, /* Fan for Lunar Lake generation */ \ - {"INTC10A2", }, /* Fan for Raptor Lake generation */ \ - {"INTC10D6", }, /* Fan for Panther Lake generation */ \ - {"INTC10FE", }, /* Fan for Wildcat Lake generation */ \ + ACPI_INT3404_DEVICE_IDS, \ {"PNP0C0B", } /* Generic ACPI fan */ =20 #define ACPI_FPS_NAME_LEN 20 diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h new file mode 100644 index 000000000000..854e4d3bb739 --- /dev/null +++ b/drivers/acpi/int340x_thermal.h @@ -0,0 +1,68 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * The ACPI INT340X device IDs are shared between the DPTF core + * and thermal drivers. + */ + +#ifndef _ACPI_INT340X_H_ +#define _ACPI_INT340X_H_ + +#define ACPI_INT3400_DEVICE_IDS \ + {"INT3400"}, \ + {"INTC1040"}, \ + {"INTC1041"}, \ + {"INTC1042"}, \ + {"INTC1068"}, \ + {"INTC10A0"}, \ + {"INTC10D4"}, \ + {"INTC10FC"} + +#define ACPI_INT3401_DEVICE_IDS \ + {"INT3401"} + +#define ACPI_INT3402_DEVICE_IDS \ + {"INT3402"} + +#define ACPI_INT3403_DEVICE_IDS \ + {"INT3403"}, \ + {"INTC1043"}, \ + {"INTC1046"}, \ + {"INTC1062"}, \ + {"INTC1069"}, \ + {"INTC10A1"}, \ + {"INTC10D5"}, \ + {"INTC10FD"} + +#define ACPI_INT3404_DEVICE_IDS \ + {"INT3404", }, /* Fan */ \ + {"INTC1044", }, /* Fan for Tiger Lake generation */ \ + {"INTC1048", }, /* Fan for Alder Lake generation */ \ + {"INTC1063", }, /* Fan for Meteor Lake generation */ \ + {"INTC106A", }, /* Fan for Lunar Lake generation */ \ + {"INTC10A2", }, /* Fan for Raptor Lake generation */ \ + {"INTC10D6", }, /* Fan for Panther Lake generation */ \ + {"INTC10FE", } /* Fan for Wildcat Lake generation */ + +#define ACPI_INT3406_DEVICE_IDS \ + {"INT3406"} + +#define ACPI_INT3407_DEVICE_IDS \ + {"INT3407"}, \ + {"INT3532"}, \ + {"INTC1047"}, \ + {"INTC1050"}, \ + {"INTC1060"}, \ + {"INTC1061"}, \ + {"INTC1065"}, \ + {"INTC1066"}, \ + {"INTC106C"}, \ + {"INTC106D"}, \ + {"INTC10A4"}, \ + {"INTC10A5"}, \ + {"INTC10D8"}, \ + {"INTC10D9"}, \ + {"INTC1100"}, \ + {"INTC1101"} + +#endif diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3400_thermal.c index 908cc1bf57f1..6311125c3ebd 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -11,6 +11,7 @@ #include #include #include "acpi_thermal_rel.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3400_THERMAL_TABLE_CHANGED 0x83 #define INT3400_ODVP_CHANGED 0x88 @@ -683,14 +684,7 @@ static void int3400_thermal_remove(struct platform_dev= ice *pdev) } =20 static const struct acpi_device_id int3400_thermal_match[] =3D { - {"INT3400", 0}, - {"INTC1040", 0}, - {"INTC1041", 0}, - {"INTC1042", 0}, - {"INTC1068", 0}, - {"INTC10A0", 0}, - {"INTC10D4", 0}, - {"INTC10FC", 0}, + ACPI_INT3400_DEVICE_IDS, {} }; =20 diff --git a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3401_thermal.c index 96d6277a5a8c..e0603f218d2e 100644 --- a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c @@ -11,9 +11,10 @@ =20 #include "int340x_thermal_zone.h" #include "processor_thermal_device.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 static const struct acpi_device_id int3401_device_ids[] =3D { - {"INT3401", 0}, + ACPI_INT3401_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3401_device_ids); diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3402_thermal.c index 57b90005888a..213d4535f2c1 100644 --- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c @@ -11,6 +11,7 @@ #include #include #include "int340x_thermal_zone.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3402_PERF_CHANGED_EVENT 0x80 #define INT3402_THERMAL_EVENT 0x90 @@ -84,7 +85,7 @@ static void int3402_thermal_remove(struct platform_device= *pdev) } =20 static const struct acpi_device_id int3402_thermal_match[] =3D { - {"INT3402", 0}, + ACPI_INT3402_DEVICE_IDS, {} }; =20 diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3403_thermal.c index ba63796761eb..d246c69d4872 100644 --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c @@ -12,6 +12,7 @@ #include #include #include "int340x_thermal_zone.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3403_TYPE_SENSOR 0x03 #define INT3403_TYPE_CHARGER 0x0B @@ -269,14 +270,7 @@ static void int3403_remove(struct platform_device *pde= v) } =20 static const struct acpi_device_id int3403_device_ids[] =3D { - {"INT3403", 0}, - {"INTC1043", 0}, - {"INTC1046", 0}, - {"INTC1062", 0}, - {"INTC1069", 0}, - {"INTC10A1", 0}, - {"INTC10D5", 0}, - {"INTC10FD", 0}, + ACPI_INT3403_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3403_device_ids); diff --git a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3406_thermal.c index e21fcbccf4ba..d05ca8bc4061 100644 --- a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c @@ -12,6 +12,7 @@ #include #include #include +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3406_BRIGHTNESS_LIMITS_CHANGED 0x80 =20 @@ -187,7 +188,7 @@ static void int3406_thermal_remove(struct platform_devi= ce *pdev) } =20 static const struct acpi_device_id int3406_thermal_match[] =3D { - {"INT3406", 0}, + ACPI_INT3406_DEVICE_IDS, {} }; =20 --=20 2.51.0.618.g983fd99d29-goog From nobody Thu Oct 2 14:22:15 2025 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B54C30FC3E for ; Thu, 2 Oct 2025 11:34:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404854; cv=none; b=GXvzH28clLnrwSGT0QOSGMv4YExYlQb3ZsN6bJhfkTEDgUIzW9MsOvlxcqHf5wArLGGrhIXIIA26Kn+gIV8Mmv+1zzm/7MNd7TkY0XZgejSGRRSH+7pclmWhSfBKwEaetePB2QpjB0kK/Ur3qyfVhn+ogxUdznqliBDZgUDomAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404854; c=relaxed/simple; bh=jfsm2ihec0Ij6D1XgluxMV8iWwWlkJpjGypCPVRhAc4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Wq2HMaCIqViRMw+4OQERWpv7/cwhtN0nw2RRDy7YezyQvuEf1Bw8QbM5ixcRM6bxNpPqw/OqUHoxUErTKdTSPg12AllBAOpvxWevzlCe0zbAT39WNwJD0qgVc8cDS5giBVyFRrgENpqPEaYkX08nZIz5ZkM45S85ZTqk7yZnLMA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=zfIP2mpK; arc=none smtp.client-ip=209.85.218.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zfIP2mpK" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-b07c2924d53so99845766b.3 for ; Thu, 02 Oct 2025 04:34:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759404850; x=1760009650; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nsF74hIKs6vv4bMpoGjNhgbv1OkZNlvSZ0wfNAU9kvo=; b=zfIP2mpK2sWVGEV82fHhUhvz34cNDeXGN4XUjXTpCyMcvCI/k5TH9GVma8pEhsd+Dp /0/heT8RNHbnpC6grX5LzrI9ni1qgBOrSHdq9L6VWf2iHsyz14/irHY9Fq7nij4kTMgD FgM/u4iitWrdyyyUbduxbr69buo2MIFHME0/KZ05SKxSVfihLNsf9mPZUAWr+0IhvmMh 7whvpBd6rKEcCHgqXlIlyivZbinew4N4rKLGUK43Eboae8iMF7JX5ks8lE9GxxtH3J/S ahvuMDmLxR4jrrcYb15WHyrSxaJubD+67T+32lq0c9jnZIudrIjhKcHsGN5cxJmT5a1o EnVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759404850; x=1760009650; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nsF74hIKs6vv4bMpoGjNhgbv1OkZNlvSZ0wfNAU9kvo=; b=O9LuDinYZJ1q1y011/iW02U7+/7XUBHC5vfmEaJ+uvxQIkmBalbOFUn0G5azaqj2Rz osfY8boRx1Wuuh/uUdZMYQ7NbkQ1TRwUVxuevs71mkE+Va3+Smcjk2xV+L2VCV03rUl+ xuOs7FhYw+bm7rODtaZ8LSQApJYQMXOxkzTWxgruw55RI2C43XaVmoiHSP4ZojqAuf6K Ekxjti5PAasBsqsQNIEe5OdUfj6YUhY6JIpK7tE3Hx96lGZw/vwGcunON2oitAYvsOsu ZlXdQIY/+xJAlxiyw2LXr2SrXHJsxk9MshFCgwMF/smISj/QfwdmDZyiWT1RRUmx40qK BR9Q== X-Forwarded-Encrypted: i=1; AJvYcCWejZeG3MymLRjfRPzdI+5nVv+/WW7pn+jAIWJjbZg/tDfRjnRp0FfPsPEG8la8IKwdjFiMmaTrGGjlBXw=@vger.kernel.org X-Gm-Message-State: AOJu0YyRZGF1C1QnA+KRPs+nt8CBowWDiBw4JbdlEwcawsf/0D6aPj54 KVWSJr7DLdD3uwfOFdcmIZ8B9gzEHCQnZo2iTPEYbLBzS9y3il4gfT/T7UiYGXU3rZCdwX1qAdg c5VbHQA== X-Google-Smtp-Source: AGHT+IHCAit/8YQcXIsfYzBnBeg8HNIVckd9DveCqqDF2kk0znWLWbMaqekiVc5odCp6J9aT9G9xhrXUKSA= X-Received: from ejcqa31.prod.google.com ([2002:a17:907:869f:b0:b3b:66f0:451b]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:2683:b0:b3c:a161:684c with SMTP id a640c23a62f3a-b46e4b8f4d0mr817414866b.2.1759404849866; Thu, 02 Oct 2025 04:34:09 -0700 (PDT) Date: Thu, 2 Oct 2025 11:34:01 +0000 In-Reply-To: <20251002113404.3117429-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251002113404.3117429-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251002113404.3117429-4-srosek@google.com> Subject: [PATCH v3 3/6] ACPI: DPTF: Move PCH FIVR device IDs to header From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ACPI PCH FIVR device IDs are shared between the DPTF core and PCH FIVR driver, thus they are moved to the common header. Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/dptf_pch_fivr.c | 8 ++------ drivers/acpi/dptf/int340x_thermal.c | 7 +------ drivers/acpi/int340x_thermal.h | 8 ++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch= _fivr.c index 952216c67d58..cb81636a5d63 100644 --- a/drivers/acpi/dptf/dptf_pch_fivr.c +++ b/drivers/acpi/dptf/dptf_pch_fivr.c @@ -8,6 +8,7 @@ #include #include #include +#include "../int340x_thermal.h" =20 struct pch_fivr_resp { u64 status; @@ -147,12 +148,7 @@ static void pch_fivr_remove(struct platform_device *pd= ev) } =20 static const struct acpi_device_id pch_fivr_device_ids[] =3D { - {"INTC1045", 0}, - {"INTC1049", 0}, - {"INTC1064", 0}, - {"INTC106B", 0}, - {"INTC10A3", 0}, - {"INTC10D7", 0}, + ACPI_PCH_FIVR_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids); diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 43afb6141b98..26522ddfcbaa 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -20,16 +20,11 @@ static const struct acpi_device_id int340x_thermal_devi= ce_ids[] =3D { ACPI_INT3404_DEVICE_IDS, ACPI_INT3406_DEVICE_IDS, ACPI_INT3407_DEVICE_IDS, + ACPI_PCH_FIVR_DEVICE_IDS, {"INT3408"}, {"INT3409"}, {"INT340A"}, {"INT340B"}, - {"INTC1045"}, - {"INTC1049"}, - {"INTC1064"}, - {"INTC106B"}, - {"INTC10A3"}, - {"INTC10D7"}, {"INTC10FF"}, {"INTC1102"}, {""}, diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h index 854e4d3bb739..dee53c444a32 100644 --- a/drivers/acpi/int340x_thermal.h +++ b/drivers/acpi/int340x_thermal.h @@ -65,4 +65,12 @@ {"INTC1100"}, \ {"INTC1101"} =20 +#define ACPI_PCH_FIVR_DEVICE_IDS \ + {"INTC1045"}, \ + {"INTC1049"}, \ + {"INTC1064"}, \ + {"INTC106B"}, \ + {"INTC10A3"}, \ + {"INTC10D7"} + #endif --=20 2.51.0.618.g983fd99d29-goog From nobody Thu Oct 2 14:22:15 2025 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 986C830FF3A for ; Thu, 2 Oct 2025 11:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404854; cv=none; b=W7fokbd4NrA79pA5WOm2i+pzWg+59ap5LFULMPjno1YJ2oHM7ZySEsVjOy3hOmETYaOO2mwC5ihRLbqYbNFHNJ0kiIVImlZWnFWYyMKXQO9lmQrtfMnvIbHcqEXXzeIfajzxlgHVQF4jJ3a0hxup5uxIjZZjsnMQBrKD4Wjix4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404854; c=relaxed/simple; bh=joJFsmLC0ahfMOA1xiYAki0VFQaETHltvy6RAJznUm8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fH3s1Pg264+BP4U2lbyjPBD4ZXsFV5z6M2D/3Iu7Mk7G5dj3p181Fbrp5/ILYl8IDRS4mAB74x2DOlt1a7F6K+eRtpXNput2opAcvk5j8IeJf7fE60phnG8KGtA9YFrujwgvJotEyVS8oXOQAFEo7ZyLsHJAYwjik8Eh5K4PsK4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=AP2/bhB3; arc=none smtp.client-ip=209.85.208.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="AP2/bhB3" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-637edce76d5so274686a12.3 for ; Thu, 02 Oct 2025 04:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759404851; x=1760009651; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NE2gdnRWmdJaMiCXgFNZvZRGrqhmc689a8INpdeTYqY=; b=AP2/bhB3lfByuFHV3N1Q37yM0KeF3t1eDI2jm37FU4kncOL2xx9i/xlP17bEmMlljM t9LnD5kxizrY6xv2PftiAwcckPA+1AlTtzeplwwCP4nQzhpEnugREwhr86RsfBrF/DQz xWcHodcigTXCKscQPhJtb4ogrqO53mkZz3KlZSi0/oppXHHI6APB1vxiA2OFQqT/0KxU 3cLzlGVGQpI/OOXfCGjG9uDoIJCVCrqdBdV7YtSqvbgGiLsC7+VALse5i3URXxNNQcuv WDt565QUtP+m8SXRUdMroJUuIqbpr3dUaudPN4iQy30cD8wQCqdkbd5dzfs9YAmY66ob 38cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759404851; x=1760009651; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NE2gdnRWmdJaMiCXgFNZvZRGrqhmc689a8INpdeTYqY=; b=kW0h4XV2icAwdETfCyMJaB/kGEiIXv+kBGGvNFXmF2SiZ6QabOy5vJuCnKDKe3Ay2b ejMzcfQaWGjLWGjNhY+alw9JXojaFqLl+NCfNUP5E457iirChADHIXpAL2ry04Z2+0Vd DYjO9bY2OAc0Z1ze6TW2iIG9ZVaeeofLgQCsFWOaqjvOVMRXXPkN+EhnopHrj4Ndm8SW rI8P/RXtRMfNMKhnuIb/I8mQkSZtBslbEH8pzCxy+p2WzbA8UrJ/R0H7Wtcvn0coStzO LG4oT1nsPOAoXpRHuWrNlidN4KY6sykDVb3R6VDNEycvap4cS+9VMaaL0ap9KcCWEDcl rygQ== X-Forwarded-Encrypted: i=1; AJvYcCUcCBcYja+fSJizd26OfZFs54UBnl6cYNr0I4Tio/HwHvissfmVr1eSSGu1Z6RQg/GQWiEQDriJGKJTF00=@vger.kernel.org X-Gm-Message-State: AOJu0YyHkQ6blTlQMABAvDBPpyZBtqhfeERpyb9jaNaJNI/qiRQwX2kU AWhquXGl7E3gKU8mfnqWeCg+mFAv6XDgfVgqvCEr5N3jokY6qxZWHtqm8yX2aHjdyWlo7s2FmAZ biaFdXQ== X-Google-Smtp-Source: AGHT+IFnNGWeUW+2QiI2DEf6id556ZD0ID7jFmIizNY5EI0PMeiFKJnPQbdWshUAr7O6MaAV/CyVGfRtTZo= X-Received: from edqu5.prod.google.com ([2002:aa7:d885:0:b0:634:b46f:19de]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3489:b0:634:e004:76fd with SMTP id 4fb4d7f45d1cf-63678a9a613mr6778480a12.0.1759404850841; Thu, 02 Oct 2025 04:34:10 -0700 (PDT) Date: Thu, 2 Oct 2025 11:34:02 +0000 In-Reply-To: <20251002113404.3117429-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251002113404.3117429-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251002113404.3117429-5-srosek@google.com> Subject: [PATCH v3 4/6] ACPI: DPTF: Remove not supported INT340X IDs From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove not supported INT340X and Wildcat Lake ACPI device IDs from scan handler. Fixes: 3230bbfce8a9 ("ACPI: introduce ACPI int340x thermal scan handler") Fixes: 9cf45756a4b9 ("ACPI: DPTF: Support for Wildcat Lake") Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/int340x_thermal.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 26522ddfcbaa..7d1308b1f513 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -21,12 +21,6 @@ static const struct acpi_device_id int340x_thermal_devic= e_ids[] =3D { ACPI_INT3406_DEVICE_IDS, ACPI_INT3407_DEVICE_IDS, ACPI_PCH_FIVR_DEVICE_IDS, - {"INT3408"}, - {"INT3409"}, - {"INT340A"}, - {"INT340B"}, - {"INTC10FF"}, - {"INTC1102"}, {""}, }; =20 --=20 2.51.0.618.g983fd99d29-goog From nobody Thu Oct 2 14:22:15 2025 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32D3C3101D8 for ; Thu, 2 Oct 2025 11:34:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404857; cv=none; b=DpHSaqGyOZ0sfOMigFL7oQK1tq1OBx+0A3By2RnhpDJM1I16+3oPLPksR8QRbvhluwD6Z43WGyNZ8FopITjSr4P8T/CwM6Sez0emgPdlwBuqFtq+xlDLU8WpE+pXvf8GMBltMFWNeoJCTncP9RygLqvpfaulFIljPj2+Eu00dXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404857; c=relaxed/simple; bh=jGzuARMYnBvr8zehQalwEPWJlbunoDDp9WM0aTu/GGg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZG97QQisnG027foXOS1J7V7DIGF9QF9hXM7iP+Az61B4HJdNiPkPDvwowEp1kGNk9KvXR3pi1HxGxwUsB2My7z0lomE1abhhRHXzf5uRMe7wXMi/kBFQuLqFrrHLVNOVTDHcMhzcUozng2DS2Rle/ktLw4cCk7Dia5JwlG1D+C0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2K1FyOdl; arc=none smtp.client-ip=209.85.208.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2K1FyOdl" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-6349af0e766so1251678a12.3 for ; Thu, 02 Oct 2025 04:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759404852; x=1760009652; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Z336Gm+cXT/UC4w0tslyQ8BibQkKtAXFk7vuVFzlfeA=; b=2K1FyOdlo3UIrximlpqg2XmXJQRzmYOWpD/OWzCyUWyTJFxJVp1OLslekisNKc5tXk zTMUBYMad/YIL5I76baRdwLYqFePRYLcNYu7p4JftUTZIBUZQtSgXuly1vAfTe345wvL kgi2eSbDKGMeW6ZZ2Vl8unvLfuQMcI+lcEbVr72acLCdpKMABUfqgzyNNmXZn3Ji95Sv 8YPCtuObD0ltufuqlAChcOMP0I/nCWFKGC85PSU8oud8hqQFqh/xY3B3yuYPZeVULd2K EOthOqiCaSd27WT1BRWfrJ6lv4pguyMAOwW1NfWcxHDd0TQWlX1b+1rJx6HpPeXzzU9u esYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759404852; x=1760009652; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z336Gm+cXT/UC4w0tslyQ8BibQkKtAXFk7vuVFzlfeA=; b=UG8rS6BcAL2gZOSfXSgzskgenUoTMo1BMyzyzuBt+1LdK3q9ak5P4dywsUEhld1CWo AyjZmjFWa9POXqS2Az09nOGZwIdrP/gAl8PSxwf8Vmwr+iV9k71CDmLVDq9kPtGr88WN n+WIR48+RPY9flSgHZSEHt9QEB8xZiyAOjXIVwBzMJp1Gm4tGYPWHwSi5JmeIpELisEJ tgEvH+Ctkz0CVoPvV0wqVZGqv9xjeOVORyWhF7DYe7ft3ehNRuDsY3FzOmwWxp2FIxER Pe9cf/FRqWT+oLkrLg7Vdxx9PhDmxcd3JeTHtAmRFvJA//ibb9BbvFgAyBM6DBoz291o YMYQ== X-Forwarded-Encrypted: i=1; AJvYcCWIuY89edwCSAhZ9qMdFFMX32RDnjbzkUgH8o7MmcSqIBfAOtRGILXqC5/lYDfyWPCuWimRe2G4Exh3qBY=@vger.kernel.org X-Gm-Message-State: AOJu0Ywb49zw0EIaI96mqDRq22OhTkwxqCCapoAYWAcmWSVmmb9xSa5F DxzUvBZsyIZMtASXe3+bRgMsmMwoBjuBRqjh+qMyv+sEPFnmDoJFbMyHv43NOIWRE8vhRR149oA plNGkDg== X-Google-Smtp-Source: AGHT+IFAVHO3UURkms4Px09NV4CiDY2z3xTeYtmA76T6c6XpkpIyxX6hgNSwOsfI7DB7ygO5B6MwLch1EDU= X-Received: from edyb2.prod.google.com ([2002:aa7:df82:0:b0:634:5269:e012]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:354f:b0:634:b651:48b9 with SMTP id 4fb4d7f45d1cf-63678bce60amr7133335a12.4.1759404852085; Thu, 02 Oct 2025 04:34:12 -0700 (PDT) Date: Thu, 2 Oct 2025 11:34:03 +0000 In-Reply-To: <20251002113404.3117429-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251002113404.3117429-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251002113404.3117429-6-srosek@google.com> Subject: [PATCH v3 5/6] ACPI: platform: Add macro for acpi platform driver From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce module_acpi_platform_driver() macro to simplify dynamic enumeration of ACPI device objects on the platform bus by loadable modules. Move common code from the intel-hid and intel-vbtn drivers to the ACPI platform core. Signed-off-by: Slawomir Rosek --- drivers/acpi/acpi_platform.c | 27 +++++++++++++++++++++++++ drivers/platform/x86/intel/hid.c | 33 +++---------------------------- drivers/platform/x86/intel/vbtn.c | 30 +--------------------------- include/linux/platform_device.h | 17 ++++++++++++++++ 4 files changed, 48 insertions(+), 59 deletions(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 48d15dd785f6..adf32ffa6be6 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -190,6 +190,33 @@ struct platform_device *acpi_create_platform_device(st= ruct acpi_device *adev, } EXPORT_SYMBOL_GPL(acpi_create_platform_device); =20 +static acpi_status +__acpi_platform_driver_register_cb(acpi_handle handle, u32 lvl, + void *context, void **rv) +{ + const struct acpi_device_id *ids =3D context; + struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); + + if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) + if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) { + dev_info(&dev->dev, + "created platform device\n"); + } + + return AE_OK; +} + +int __acpi_platform_driver_register(struct platform_driver *drv, + struct module *owner) +{ + acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, + __acpi_platform_driver_register_cb, NULL, + (void *)drv->driver.acpi_match_table, NULL); + + return __platform_driver_register(drv, owner); +} +EXPORT_SYMBOL_GPL(__acpi_platform_driver_register); + void __init acpi_platform_init(void) { acpi_reconfig_notifier_register(&acpi_platform_notifier); diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/= hid.c index f25a427cccda..37f990686446 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -775,34 +775,7 @@ static struct platform_driver intel_hid_pl_driver =3D { * * As a workaround until the ACPI core figures out how to handle * this corner case, manually ask the ACPI platform device code to - * claim the ACPI node. + * claim the ACPI node by using module_acpi_platform_driver() + * instead of the regular module_platform_driver(). */ -static acpi_status __init -check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) -{ - const struct acpi_device_id *ids =3D context; - struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); - - if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) - if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) - dev_info(&dev->dev, - "intel-hid: created platform device\n"); - - return AE_OK; -} - -static int __init intel_hid_init(void) -{ - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, check_acpi_dev, NULL, - (void *)intel_hid_ids, NULL); - - return platform_driver_register(&intel_hid_pl_driver); -} -module_init(intel_hid_init); - -static void __exit intel_hid_exit(void) -{ - platform_driver_unregister(&intel_hid_pl_driver); -} -module_exit(intel_hid_exit); +module_acpi_platform_driver(intel_hid_pl_driver); diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel= /vbtn.c index 232cd12e3c9f..42932479de35 100644 --- a/drivers/platform/x86/intel/vbtn.c +++ b/drivers/platform/x86/intel/vbtn.c @@ -390,32 +390,4 @@ static struct platform_driver intel_vbtn_pl_driver =3D= { .remove =3D intel_vbtn_remove, }; =20 -static acpi_status __init -check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) -{ - const struct acpi_device_id *ids =3D context; - struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); - - if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) - if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) - dev_info(&dev->dev, - "intel-vbtn: created platform device\n"); - - return AE_OK; -} - -static int __init intel_vbtn_init(void) -{ - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, check_acpi_dev, NULL, - (void *)intel_vbtn_ids, NULL); - - return platform_driver_register(&intel_vbtn_pl_driver); -} -module_init(intel_vbtn_init); - -static void __exit intel_vbtn_exit(void) -{ - platform_driver_unregister(&intel_vbtn_pl_driver); -} -module_exit(intel_vbtn_exit); +module_acpi_platform_driver(intel_vbtn_pl_driver); diff --git a/include/linux/platform_device.h b/include/linux/platform_devic= e.h index 074754c23d33..3b70b054d8a5 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -264,6 +264,14 @@ extern int __platform_driver_register(struct platform_= driver *, struct module *); extern void platform_driver_unregister(struct platform_driver *); =20 +/* + * use a macro to avoid include chaining to get THIS_MODULE + */ +#define acpi_platform_driver_register(drv) \ + __acpi_platform_driver_register(drv, THIS_MODULE) +extern int __acpi_platform_driver_register(struct platform_driver *, + struct module *); + /* non-hotpluggable platform devices may use this so that probe() and * its support may live in __init sections, conserving runtime memory. */ @@ -292,6 +300,15 @@ static inline void platform_set_drvdata(struct platfor= m_device *pdev, module_driver(__platform_driver, platform_driver_register, \ platform_driver_unregister) =20 +/* module_acpi_platform_driver() - Helper macro for drivers that don't do + * anything special in module init/exit. This eliminates a lot of + * boilerplate. Each module may only use this macro once, and + * calling it replaces module_init() and module_exit() + */ +#define module_acpi_platform_driver(__platform_driver) \ + module_driver(__platform_driver, acpi_platform_driver_register, \ + platform_driver_unregister) + /* builtin_platform_driver() - Helper macro for builtin drivers that * don't do anything special in driver init. This eliminates some * boilerplate. Each driver may only use this macro once, and --=20 2.51.0.618.g983fd99d29-goog From nobody Thu Oct 2 14:22:15 2025 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 856E831076B for ; Thu, 2 Oct 2025 11:34:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404857; cv=none; b=s8YanCqOzK+prazui5rVqO3++EulnpcpeYoO/7x9ramikCHsp8NoaG3P5aMmaNXG7qMIvwaShOVEcBJnKBuvauoSFrWM43OsA6xkFD+QSlkpjH8kM2badmczVkZu/pDyQR42OpvBzm6xagP1guPj67NI42xBeXvqKt/gJQSXQUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759404857; c=relaxed/simple; bh=4OP6QBdFKr1574GZhyc2cb1Lv+GX8ez8QVbJWQWOSGk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=d7J5T1RlVt2NY+6Gk517IoOlZfaNArdPCzM5lwZk+AZWzCcUzPQxAhF7OHxK3XOzo3wGrxdx0nLClxS/LJFe0oPyQpaE/Xd5OQLcml3RVAseHiecxOW7/D/JhgNRtNvDUHUwJWbxz21Wi4uh/xeJNLvu/yCwae1ceha1xG5BCuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=yl9o4QIS; arc=none smtp.client-ip=209.85.208.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="yl9o4QIS" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-62fcb646334so1038448a12.2 for ; Thu, 02 Oct 2025 04:34:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759404854; x=1760009654; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=kgpUJcZIT53UUziBi2oBrvyEh4rGfYabLqvWzsqp90A=; b=yl9o4QISp/HuDiOBl78uizac9ONNsWBTwjSk7NgXErl4BxfQtpffv2wI5ED6LimNq3 z0X0q86LNIKfevGBCGt7SFDuC16e3cZLAtE+5GaMd/v3zNMsyCW8u6NKaf+LdCbu5L+b 4b44NeULuk2NrIXQ91iltZaVY6OOu43wvq2h51yFjetvU02ScTDEGf2e8etZFoXj3r6T Xolj7ywxVMmJ7wOS8lB5uXuZTGhSQr8OcXG2i8jz9niRHHC42ygPfBW51IAObukXKfRe Hnc/rPpjaGrwWNQlCnlgGSfq+wly/kJMmJgen3FPvQ6bzO9y0dl1AoQd+ZY3cSCKZfwm mfkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759404854; x=1760009654; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kgpUJcZIT53UUziBi2oBrvyEh4rGfYabLqvWzsqp90A=; b=PMCLXzVcjRMZafna1VhDI+HjbDpZ3biiUtLLdABHRBqcP0cX1j7g/G1yW0jtp1Nysi gm8jszfZV1djK6QO4qqshB26NQQpR8GanbnL0zvB0DMtcV19OMnZ35wqAwD6saqddKje 9885uMjUXy9pBK3HDFvBm8U1FiWuI3F9VG8NirFB2X/M1Ypa4AcnHvnBSqFy8DSpng1q BbI/4ISQ1NRbSrKpu9rXdb9VPTpsqKeP6hDIeIjgjrGGu0qkWsVuASxYAUGTVLkJLxMw kvTg0T3w7IBJdOU/VskQ0nIIrBopuOpgqNAaBz7p6M66udHuFyX0xdc4w7g0QZAvZLRC MR+g== X-Forwarded-Encrypted: i=1; AJvYcCVm9AvPLv7D+Pn49+0IqvKtBhw++L2vvK8umh7UXSaN+JlriApswx3xuB661KIhPu9tMuYTKFtm0W+JWC0=@vger.kernel.org X-Gm-Message-State: AOJu0YxYH49M87FyQ5CE80+KPvSL7eNQr+saSCNeyfWxSItkDWAqKvol Sy7E82NAsVynT0vCVFhwgtTQ1dnyN2CyJOmu6Y1sIN3XXLFZ6Quu/AjIAqLawN8EX3LfP6Mm8HS fTaJrcA== X-Google-Smtp-Source: AGHT+IEViJurBgSj1HUwewxJ2lufwYxLh7QiIceZMFqK3KJHnZaS1MP+gTNpl0gquADVo4qzM8B94yHCRDA= X-Received: from edqm3.prod.google.com ([2002:aa7:c483:0:b0:636:4ff7:efe]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:909:b0:637:ec7d:4d6c with SMTP id 4fb4d7f45d1cf-637ec7d4f8cmr859439a12.11.1759404853757; Thu, 02 Oct 2025 04:34:13 -0700 (PDT) Date: Thu, 2 Oct 2025 11:34:04 +0000 In-Reply-To: <20251002113404.3117429-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251002113404.3117429-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251002113404.3117429-7-srosek@google.com> Subject: [PATCH v3 6/6] ACPI: DPTF: Move INT340X enumeration to modules From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move enumeration of INT340X ACPI device objects on the platform bus from DPTF core to thermal drivers using ACPI platform core methods Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/dptf_pch_fivr.c | 2 +- drivers/acpi/dptf/dptf_power.c | 2 +- drivers/acpi/dptf/int340x_thermal.c | 7 +++++-- drivers/acpi/fan_core.c | 2 +- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3401_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3402_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3406_thermal.c | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch= _fivr.c index cb81636a5d63..f3cd52c89e8d 100644 --- a/drivers/acpi/dptf/dptf_pch_fivr.c +++ b/drivers/acpi/dptf/dptf_pch_fivr.c @@ -162,7 +162,7 @@ static struct platform_driver pch_fivr_driver =3D { }, }; =20 -module_platform_driver(pch_fivr_driver); +module_acpi_platform_driver(pch_fivr_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c index d7c59f016083..b85e876b2e85 100644 --- a/drivers/acpi/dptf/dptf_power.c +++ b/drivers/acpi/dptf/dptf_power.c @@ -239,7 +239,7 @@ static struct platform_driver dptf_power_driver =3D { }, }; =20 -module_platform_driver(dptf_power_driver); +module_acpi_platform_driver(dptf_power_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 7d1308b1f513..b2be3a8df9ac 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -27,8 +27,11 @@ static const struct acpi_device_id int340x_thermal_devic= e_ids[] =3D { static int int340x_thermal_handler_attach(struct acpi_device *adev, const struct acpi_device_id *id) { - if (IS_ENABLED(CONFIG_INT340X_THERMAL)) - acpi_create_platform_device(adev, NULL); + /* + * Do not attach INT340X devices until platform drivers are loaded. + * Enumeration of INT340X ACPI device objects on the platform bus + * should be done by thermal drivers. + */ return 1; } =20 diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c index 04ff608f2ff0..61681ff24477 100644 --- a/drivers/acpi/fan_core.c +++ b/drivers/acpi/fan_core.c @@ -463,7 +463,7 @@ static struct platform_driver acpi_fan_driver =3D { }, }; =20 -module_platform_driver(acpi_fan_driver); +module_acpi_platform_driver(acpi_fan_driver); =20 MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_DESCRIPTION("ACPI Fan Driver"); diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3400_thermal.c index 6311125c3ebd..0005961328fc 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -699,7 +699,7 @@ static struct platform_driver int3400_thermal_driver = =3D { }, }; =20 -module_platform_driver(int3400_thermal_driver); +module_acpi_platform_driver(int3400_thermal_driver); =20 MODULE_DESCRIPTION("INT3400 Thermal driver"); MODULE_AUTHOR("Zhang Rui "); diff --git a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3401_thermal.c index e0603f218d2e..d496f8b171e0 100644 --- a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c @@ -69,7 +69,7 @@ static struct platform_driver int3401_driver =3D { }, }; =20 -module_platform_driver(int3401_driver); +module_acpi_platform_driver(int3401_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_DESCRIPTION("Processor Thermal Reporting Device Driver"); diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3402_thermal.c index 213d4535f2c1..d06c06fadce5 100644 --- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c @@ -100,7 +100,7 @@ static struct platform_driver int3402_thermal_driver = =3D { }, }; =20 -module_platform_driver(int3402_thermal_driver); +module_acpi_platform_driver(int3402_thermal_driver); =20 MODULE_DESCRIPTION("INT3402 Thermal driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3403_thermal.c index d246c69d4872..33735515b47d 100644 --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c @@ -284,7 +284,7 @@ static struct platform_driver int3403_driver =3D { }, }; =20 -module_platform_driver(int3403_driver); +module_acpi_platform_driver(int3403_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3406_thermal.c index d05ca8bc4061..03cc026cdffb 100644 --- a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c @@ -203,7 +203,7 @@ static struct platform_driver int3406_thermal_driver = =3D { }, }; =20 -module_platform_driver(int3406_thermal_driver); +module_acpi_platform_driver(int3406_thermal_driver); =20 MODULE_DESCRIPTION("INT3406 Thermal driver"); MODULE_LICENSE("GPL v2"); --=20 2.51.0.618.g983fd99d29-goog