summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ec/acpi/Kconfig6
-rw-r--r--src/ec/google/chromeec/Kconfig1
-rw-r--r--src/ec/google/wilco/Kconfig1
-rw-r--r--src/ec/google/wilco/acpi/dptf.asl2
-rw-r--r--src/mainboard/google/cyan/acpi/dptf.asl2
-rw-r--r--src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl3
-rw-r--r--src/soc/intel/baytrail/acpi/dptf/thermal.asl3
-rw-r--r--src/soc/intel/braswell/acpi/dptf/thermal.asl4
-rw-r--r--src/soc/intel/common/acpi/dptf/thermal.asl3
-rw-r--r--src/soc/intel/skylake/acpi/dptf/thermal.asl3
10 files changed, 25 insertions, 3 deletions
diff --git a/src/ec/acpi/Kconfig b/src/ec/acpi/Kconfig
index 3081a86609..1fa707abdc 100644
--- a/src/ec/acpi/Kconfig
+++ b/src/ec/acpi/Kconfig
@@ -2,3 +2,9 @@ config EC_ACPI
bool
help
ACPI Embedded Controller interface. Mostly found in laptops.
+
+config EC_SUPPORTS_DPTF_TEVT
+ bool
+ help
+ The EC ASL code supports calling of TEVT method when provided by
+ SoC or mainboard.
diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig
index 2eb3b95c7d..b33864f09e 100644
--- a/src/ec/google/chromeec/Kconfig
+++ b/src/ec/google/chromeec/Kconfig
@@ -1,5 +1,6 @@
config EC_GOOGLE_CHROMEEC
bool
+ select EC_SUPPORTS_DPTF_TEVT
help
Google's Chrome EC
diff --git a/src/ec/google/wilco/Kconfig b/src/ec/google/wilco/Kconfig
index 25d7cfafc2..ee7b556551 100644
--- a/src/ec/google/wilco/Kconfig
+++ b/src/ec/google/wilco/Kconfig
@@ -3,6 +3,7 @@ config EC_GOOGLE_WILCO
default n
select EC_GOOGLE_COMMON_MEC
select EC_ACPI
+ select EC_SUPPORTS_DPTF_TEVT
help
Google Wilco Embedded Controller interface.
diff --git a/src/ec/google/wilco/acpi/dptf.asl b/src/ec/google/wilco/acpi/dptf.asl
index 0f1663f714..42fc9fdeed 100644
--- a/src/ec/google/wilco/acpi/dptf.asl
+++ b/src/ec/google/wilco/acpi/dptf.asl
@@ -115,8 +115,10 @@ Method (PATX, 0, Serialized)
/* Handle bits that are set */
While (FindSetRightBit (Local1, Local2))
{
+#ifdef HAVE_THERM_EVENT_HANDLER
/* DPTF will Notify sensor devices */
\_SB.DPTF.TEVT (Local2)
+#endif
/* Clear current sensor number */
Local1 &= ~(1 << (Local2 - 1))
diff --git a/src/mainboard/google/cyan/acpi/dptf.asl b/src/mainboard/google/cyan/acpi/dptf.asl
index 70ab86217b..81e9fee397 100644
--- a/src/mainboard/google/cyan/acpi/dptf.asl
+++ b/src/mainboard/google/cyan/acpi/dptf.asl
@@ -15,8 +15,6 @@
* GNU General Public License for more details.
*/
-#define HAVE_THERM_EVENT_HANDLER
-
/* Include Variant DPTF */
#include <variant/acpi/dptf.asl>
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
index 1ff308dd75..77482a4bd4 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
@@ -16,6 +16,8 @@
/* Thermal Threshold Event Handler */
#define HAVE_THERM_EVENT_HANDLER
+
+#if CONFIG(EC_SUPPORTS_DPTF_TEVT)
Method (TEVT, 1, NotSerialized)
{
Store (ToInteger (Arg0), Local0)
@@ -36,6 +38,7 @@ Method (TEVT, 1, NotSerialized)
}
#endif
}
+#endif
/* Thermal device initialization - Disable Aux Trip Points */
Method (TINI)
diff --git a/src/soc/intel/baytrail/acpi/dptf/thermal.asl b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
index d84ae4b040..106cd77015 100644
--- a/src/soc/intel/baytrail/acpi/dptf/thermal.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
@@ -14,6 +14,8 @@
/* Thermal Threshold Event Handler */
#define HAVE_THERM_EVENT_HANDLER
+
+#if CONFIG(EC_SUPPORTS_DPTF_TEVT)
Method (TEVT, 1, NotSerialized)
{
Store (ToInteger (Arg0), Local0)
@@ -34,6 +36,7 @@ Method (TEVT, 1, NotSerialized)
}
#endif
}
+#endif
/* Thermal device initialization - Disable Aux Trip Points */
Method (TINI)
diff --git a/src/soc/intel/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl
index 1fdbea01ca..7daa36c8d4 100644
--- a/src/soc/intel/braswell/acpi/dptf/thermal.asl
+++ b/src/soc/intel/braswell/acpi/dptf/thermal.asl
@@ -15,7 +15,9 @@
*/
/* Thermal Threshold Event Handler */
-#ifdef HAVE_THERM_EVENT_HANDLER
+#define HAVE_THERM_EVENT_HANDLER
+
+#if CONFIG(EC_SUPPORTS_DPTF_TEVT)
Method (TEVT, 1, NotSerialized)
{
Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl
index d41f62354b..7058b27f38 100644
--- a/src/soc/intel/common/acpi/dptf/thermal.asl
+++ b/src/soc/intel/common/acpi/dptf/thermal.asl
@@ -16,6 +16,8 @@
/* Thermal Threshold Event Handler */
#define HAVE_THERM_EVENT_HANDLER
+
+#if CONFIG(EC_SUPPORTS_DPTF_TEVT)
Method (TEVT, 1, NotSerialized)
{
Store (ToInteger (Arg0), Local0)
@@ -41,6 +43,7 @@ Method (TEVT, 1, NotSerialized)
}
#endif
}
+#endif
/* Thermal device initialization - Disable Aux Trip Points */
Method (TINI)
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index 5f3548e014..742b092311 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -16,6 +16,8 @@
/* Thermal Threshold Event Handler */
#define HAVE_THERM_EVENT_HANDLER
+
+#if CONFIG(EC_SUPPORTS_DPTF_TEVT)
Method (TEVT, 1, NotSerialized)
{
@@ -40,6 +42,7 @@ Method (TEVT, 1, NotSerialized)
}
#endif
}
+#endif
/* Thermal device initialization - Disable Aux Trip Points */
Method (TINI)