summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/common/acpi/dptf.asl20
-rw-r--r--src/soc/intel/common/acpi/dptf/charger.asl3
-rw-r--r--src/soc/intel/common/acpi/dptf/dptf.asl6
-rw-r--r--src/soc/intel/common/acpi/dptf/fan.asl3
-rw-r--r--src/soc/intel/common/acpi/dptf/thermal.asl12
5 files changed, 37 insertions, 7 deletions
diff --git a/src/soc/intel/common/acpi/dptf.asl b/src/soc/intel/common/acpi/dptf.asl
index bd6d63ef40..50ed2f21f1 100644
--- a/src/soc/intel/common/acpi/dptf.asl
+++ b/src/soc/intel/common/acpi/dptf.asl
@@ -1,7 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef DPTF_CPU_DEVICE
#define DPTF_CPU_DEVICE TCPU
+#endif
+
+#ifndef DPTF_CPU_ADDR
#define DPTF_CPU_ADDR 0x00040000
+#endif
#ifndef DPTF_CPU_PASSIVE
#define DPTF_CPU_PASSIVE 80
@@ -30,3 +35,18 @@
#ifndef DPTF_CPU_ACTIVE_AC4
#define DPTF_CPU_ACTIVE_AC4 50
#endif
+
+/* DPTF ACPI Device ID */
+#ifndef DPTF_DPTF_DEVICE
+#define DPTF_DPTF_DEVICE "INT3400"
+#endif
+
+/* Generic ACPI Device ID for TSR0/1/2/3 and charger */
+#ifndef DPTF_GEN_DEVICE
+#define DPTF_GEN_DEVICE "INT3403"
+#endif
+
+/* Fan ACPI Device ID */
+#ifndef DPTF_FAN_DEVICE
+#define DPTF_FAN_DEVICE "INT3404"
+#endif
diff --git a/src/soc/intel/common/acpi/dptf/charger.asl b/src/soc/intel/common/acpi/dptf/charger.asl
index 96d314fc40..3abb08259c 100644
--- a/src/soc/intel/common/acpi/dptf/charger.asl
+++ b/src/soc/intel/common/acpi/dptf/charger.asl
@@ -2,7 +2,8 @@
Device (TCHG)
{
- Name (_HID, "INT3403")
+ Name (_HID, DPTF_GEN_DEVICE)
+
Name (_UID, 0)
Name (PTYP, 0x0B)
Name (_STR, Unicode("Battery Charger"))
diff --git a/src/soc/intel/common/acpi/dptf/dptf.asl b/src/soc/intel/common/acpi/dptf/dptf.asl
index 2219c686bf..69d2bae402 100644
--- a/src/soc/intel/common/acpi/dptf/dptf.asl
+++ b/src/soc/intel/common/acpi/dptf/dptf.asl
@@ -1,8 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+/* Include common dptf ASL files */
+#include <soc/intel/common/acpi/dptf.asl>
+
Device (DPTF)
{
- Name (_HID, EISAID ("INT3400"))
+ Name (_HID, DPTF_DPTF_DEVICE)
+
Name (_UID, 0)
Name (IDSP, Package()
diff --git a/src/soc/intel/common/acpi/dptf/fan.asl b/src/soc/intel/common/acpi/dptf/fan.asl
index 4b399a3a42..120f9bc44f 100644
--- a/src/soc/intel/common/acpi/dptf/fan.asl
+++ b/src/soc/intel/common/acpi/dptf/fan.asl
@@ -2,7 +2,8 @@
Device (TFN1)
{
- Name (_HID, "INT3404")
+ Name (_HID, DPTF_FAN_DEVICE)
+
Name (_UID, 0)
Name (_STR, Unicode("Fan Control"))
diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl
index 448688849f..e4e005c53d 100644
--- a/src/soc/intel/common/acpi/dptf/thermal.asl
+++ b/src/soc/intel/common/acpi/dptf/thermal.asl
@@ -95,7 +95,8 @@ Method (DTRP, 2, Serialized)
Device (TSR0)
{
- Name (_HID, EISAID ("INT3403"))
+ Name (_HID, DPTF_GEN_DEVICE)
+
Name (_UID, 1)
Name (PTYP, 0x03)
Name (TMPI, DPTF_TSR0_SENSOR_ID)
@@ -204,7 +205,8 @@ Device (TSR0)
Device (TSR1)
{
- Name (_HID, EISAID ("INT3403"))
+ Name (_HID, DPTF_GEN_DEVICE)
+
Name (_UID, 2)
Name (PTYP, 0x03)
Name (TMPI, DPTF_TSR1_SENSOR_ID)
@@ -313,7 +315,8 @@ Device (TSR1)
Device (TSR2)
{
- Name (_HID, EISAID ("INT3403"))
+ Name (_HID, DPTF_GEN_DEVICE)
+
Name (_UID, 3)
Name (PTYP, 0x03)
Name (TMPI, DPTF_TSR2_SENSOR_ID)
@@ -422,7 +425,8 @@ Device (TSR2)
Device (TSR3)
{
- Name (_HID, EISAID ("INT3403"))
+ Name (_HID, DPTF_GEN_DEVICE)
+
Name (_UID, 4)
Name (PTYP, 0x03)
Name (TMPI, DPTF_TSR3_SENSOR_ID)