From: Slawomir Rosek <srosek@google.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Alex Hung <alexhung@gmail.com>, Hans de Goede <hansg@kernel.org>,
Ilpo Jarvinen <ilpo.jarvinen@linux.intel.com>,
AceLan Kao <acelan.kao@canonical.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Zhang Rui <rui.zhang@intel.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Tomasz Nowicki <tnowicki@google.com>,
Stanislaw Kardach <skardach@google.com>,
Michal Krawczyk <mikrawczyk@google.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org,
Slawomir Rosek <srosek@google.com>
Subject: [PATCH v1 06/12] ACPI: DPTF: Move INT3404 device IDs to header
Date: Sat, 30 Aug 2025 05:33:58 +0000 [thread overview]
Message-ID: <20250830053404.763995-7-srosek@google.com> (raw)
In-Reply-To: <20250830053404.763995-1-srosek@google.com>
The ACPI INT3404 device IDs are shared between the DPTF core
and thermal drivers, thus they are moved to the common header.
Signed-off-by: Slawomir Rosek <srosek@google.com>
---
drivers/acpi/dptf/int340x_thermal.c | 9 +--------
drivers/acpi/fan.h | 10 ++--------
drivers/acpi/int340x_thermal.h | 10 ++++++++++
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index f042bf22b664..be2299aadcff 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -17,7 +17,7 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
ACPI_INT3401_DEVICE_IDS,
ACPI_INT3402_DEVICE_IDS,
ACPI_INT3403_DEVICE_IDS,
- {"INT3404"},
+ ACPI_INT3404_DEVICE_IDS,
{"INT3406"},
{"INT3407"},
{"INT3408"},
@@ -25,31 +25,24 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
{"INT340A"},
{"INT340B"},
{"INT3532"},
- {"INTC1044"},
{"INTC1045"},
{"INTC1047"},
- {"INTC1048"},
{"INTC1049"},
{"INTC1050"},
{"INTC1060"},
{"INTC1061"},
- {"INTC1063"},
{"INTC1064"},
{"INTC1065"},
{"INTC1066"},
- {"INTC106A"},
{"INTC106B"},
{"INTC106C"},
{"INTC106D"},
- {"INTC10A2"},
{"INTC10A3"},
{"INTC10A4"},
{"INTC10A5"},
- {"INTC10D6"},
{"INTC10D7"},
{"INTC10D8"},
{"INTC10D9"},
- {"INTC10FE"},
{"INTC10FF"},
{"INTC1100"},
{"INTC1101"},
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_
#include <linux/kconfig.h>
+#include "int340x_thermal.h"
#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 */
#define ACPI_FPS_NAME_LEN 20
diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h
index 3b34b5338618..d1ffa9c3cfb7 100644
--- a/drivers/acpi/int340x_thermal.h
+++ b/drivers/acpi/int340x_thermal.h
@@ -34,4 +34,14 @@
{"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 */
+
#endif
--
2.51.0.318.gd7df087d1a-goog
next prev parent reply other threads:[~2025-08-30 5:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-30 5:33 [PATCH v1 00/12] ACPI: DPTF: Move INT340X enumeration from DPTF core to thermal drivers Slawomir Rosek
2025-08-30 5:33 ` [PATCH v1 01/12] ACPI: DPTF: Ignore SoC DTS thermal while scanning Slawomir Rosek
2025-08-30 5:33 ` [PATCH v1 02/12] ACPI: DPTF: Move INT3400 device IDs to header Slawomir Rosek
2025-08-30 5:33 ` [PATCH v1 03/12] ACPI: DPTF: Move INT3401 " Slawomir Rosek
2025-08-30 5:33 ` [PATCH v1 04/12] ACPI: DPTF: Move INT3402 " Slawomir Rosek
2025-08-30 5:33 ` [PATCH v1 05/12] ACPI: DPTF: Move INT3403 " Slawomir Rosek
2025-08-30 5:33 ` Slawomir Rosek [this message]
2025-08-30 5:33 ` [PATCH v1 07/12] ACPI: DPTF: Move INT3406 " Slawomir Rosek
2025-08-30 5:34 ` [PATCH v1 08/12] ACPI: DPTF: Move INT3407 " Slawomir Rosek
2025-08-30 5:34 ` [PATCH v1 09/12] ACPI: DPTF: Move PCH FIVR " Slawomir Rosek
2025-08-30 5:34 ` [PATCH v1 10/12] ACPI: DPTF: Remove not supported INT340X IDs Slawomir Rosek
2025-08-30 5:34 ` [PATCH v1 11/12] ACPI: platform: Add macro for acpi platform driver Slawomir Rosek
2025-08-30 15:13 ` Hans de Goede
2025-08-30 5:34 ` [PATCH v1 12/12] ACPI: DPTF: Move INT340X enumeration to modules Slawomir Rosek
2025-09-01 8:49 ` [PATCH v1 00/12] ACPI: DPTF: Move INT340X enumeration from DPTF core to thermal drivers Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250830053404.763995-7-srosek@google.com \
--to=srosek@google.com \
--cc=acelan.kao@canonical.com \
--cc=alexhung@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mikrawczyk@google.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=skardach@google.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=tnowicki@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).