summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ec/google/chromeec/acpi/ec.asl2
-rw-r--r--src/mainboard/google/glados/ec.h2
-rw-r--r--src/mainboard/google/glados/variants/caroline/include/variant/ec.h4
-rw-r--r--src/mainboard/google/glados/variants/cave/include/variant/ec.h4
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h2
-rw-r--r--src/mainboard/google/poppy/variants/soraka/include/variant/ec.h2
-rw-r--r--src/soc/intel/skylake/acpi/dptf/thermal.asl4
7 files changed, 10 insertions, 10 deletions
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 453a6d7ee3..7fb2f2449d 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -371,7 +371,7 @@ Device (EC0)
{
Store ("EC: TABLET mode switch Event", Debug)
Notify (CREC, 0x2)
-#ifdef EC_ENABLE_TABLET_EVENT
+#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
\_SB.DPTF.TPET()
#endif
#ifdef EC_ENABLE_TBMC_DEVICE
diff --git a/src/mainboard/google/glados/ec.h b/src/mainboard/google/glados/ec.h
index e893a28dee..2e383a9266 100644
--- a/src/mainboard/google/glados/ec.h
+++ b/src/mainboard/google/glados/ec.h
@@ -21,7 +21,7 @@
#include <ec/google/chromeec/ec_commands.h>
#include <variant/ec.h>
-#ifdef EC_ENABLE_TABLET_EVENT
+#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
#define MAINBOARD_EC_SCI_EVENTS \
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\
EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
diff --git a/src/mainboard/google/glados/variants/caroline/include/variant/ec.h b/src/mainboard/google/glados/variants/caroline/include/variant/ec.h
index a7ed20cec0..955820c44c 100644
--- a/src/mainboard/google/glados/variants/caroline/include/variant/ec.h
+++ b/src/mainboard/google/glados/variants/caroline/include/variant/ec.h
@@ -13,5 +13,5 @@
* GNU General Public License for more details.
*/
-/* EC ENABLE TABLET EVENT */
-#define EC_ENABLE_TABLET_EVENT
+/* EC ENABLE MULTIPLE DPTF PROFILES */
+#define EC_ENABLE_MULTIPLE_DPTF_PROFILES
diff --git a/src/mainboard/google/glados/variants/cave/include/variant/ec.h b/src/mainboard/google/glados/variants/cave/include/variant/ec.h
index 62bfec1d9f..f733bfbd70 100644
--- a/src/mainboard/google/glados/variants/cave/include/variant/ec.h
+++ b/src/mainboard/google/glados/variants/cave/include/variant/ec.h
@@ -19,5 +19,5 @@
/* Enable EC backed Keyboard Backlight in ACPI */
#define EC_ENABLE_KEYBOARD_BACKLIGHT
-/* EC ENABLE TABLET EVENT */
-#define EC_ENABLE_TABLET_EVENT
+/* EC ENABLE MULTIPLE DPTF PROFILES */
+#define EC_ENABLE_MULTIPLE_DPTF_PROFILES
diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
index 70f12d5838..127282cf9a 100644
--- a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
+++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
@@ -71,7 +71,7 @@
/* Enable LID switch and provide wake pin for EC */
#define EC_ENABLE_LID_SWITCH
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
-#define EC_ENABLE_TABLET_EVENT
+#define EC_ENABLE_MULTIPLE_DPTF_PROFILES
#define EC_ENABLE_TBMC_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
diff --git a/src/mainboard/google/poppy/variants/soraka/include/variant/ec.h b/src/mainboard/google/poppy/variants/soraka/include/variant/ec.h
index a28b9903ca..216c0d01fa 100644
--- a/src/mainboard/google/poppy/variants/soraka/include/variant/ec.h
+++ b/src/mainboard/google/poppy/variants/soraka/include/variant/ec.h
@@ -18,6 +18,6 @@
#include <baseboard/ec.h>
-#define EC_ENABLE_TABLET_EVENT /* Tablet event to support DPTF */
+#define EC_ENABLE_MULTIPLE_DPTF_PROFILES /* Config for multi-DPTF profiles */
#endif /* __MAINBOARD_EC_H__ */
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index 9798798504..052b7a5e19 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -82,13 +82,13 @@ Method (TPET)
*/
Method (DTRP, 2, Serialized)
{
-#ifdef EC_ENABLE_TABLET_EVENT
+#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
If (LEqual (\_SB.PCI0.LPCB.EC0.RCTM, One)) {
Return (CTOK (Arg0))
} Else {
#endif
Return (CTOK (Arg1))
-#ifdef EC_ENABLE_TABLET_EVENT
+#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
}
#endif
}