[coreboot-gerrit] Change in coreboot[master]: ec/google/chromeec/acpi: Rename EC_ENABLE_TABLET_EVENT config
Karthik Ramasubramanian (Code Review)
gerrit at coreboot.org
Thu Oct 25 05:27:25 CEST 2018
Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/29261
Change subject: ec/google/chromeec/acpi: Rename EC_ENABLE_TABLET_EVENT config
......................................................................
ec/google/chromeec/acpi: Rename EC_ENABLE_TABLET_EVENT config
Rename EC_ENABLE_TABLET_EVENT config as EC_ENABLE_MULTIPLE_DPTF_PROFILES
since it aligns with the use-case. Also remove it from the boards where
it is not required.
BUG=b:118149364
Change-Id: If147f1c79ceaaed00e17ec80ec6c912a8f7a8c2e
Signed-off-by: Karthikeyan Ramasubramanian <kramasub at google.com>
---
M src/ec/google/chromeec/acpi/ec.asl
M src/mainboard/google/eve/ec.h
M src/mainboard/google/glados/ec.h
M src/mainboard/google/glados/variants/caroline/include/variant/ec.h
M src/mainboard/google/glados/variants/cave/include/variant/ec.h
M src/mainboard/google/poppy/variants/nami/include/variant/ec.h
M src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
M src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
M src/mainboard/google/poppy/variants/soraka/include/variant/ec.h
M src/soc/intel/skylake/acpi/dptf/thermal.asl
10 files changed, 10 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/29261/1
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 453a6d7..7fb2f24 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -371,7 +371,7 @@
{
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/eve/ec.h b/src/mainboard/google/eve/ec.h
index 1b55248..b940121 100644
--- a/src/mainboard/google/eve/ec.h
+++ b/src/mainboard/google/eve/ec.h
@@ -77,8 +77,6 @@
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
/* Enable Tablet switch */
-#define EC_ENABLE_TABLET_EVENT
-
#define EC_ENABLE_TBMC_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
diff --git a/src/mainboard/google/glados/ec.h b/src/mainboard/google/glados/ec.h
index e893a28..2e383a9 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 a7ed20c..955820c 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 62bfec1..f733bfb 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/nami/include/variant/ec.h b/src/mainboard/google/poppy/variants/nami/include/variant/ec.h
index a5a0196..843161a 100644
--- a/src/mainboard/google/poppy/variants/nami/include/variant/ec.h
+++ b/src/mainboard/google/poppy/variants/nami/include/variant/ec.h
@@ -69,7 +69,6 @@
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
/* Enable Tablet switch */
-#define EC_ENABLE_TABLET_EVENT
#define EC_ENABLE_TBMC_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
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 70f12d5..127282c 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/rammus/include/variant/ec.h b/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
index b22fccb..d4a07b5 100644
--- a/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
@@ -73,7 +73,6 @@
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
/* Enable Tablet switch */
-#define EC_ENABLE_TABLET_EVENT
#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 a28b990..216c0d0 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 9798798..052b7a5 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -82,13 +82,13 @@
*/
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
}
--
To view, visit https://review.coreboot.org/29261
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If147f1c79ceaaed00e17ec80ec6c912a8f7a8c2e
Gerrit-Change-Number: 29261
Gerrit-PatchSet: 1
Gerrit-Owner: Karthik Ramasubramanian <kramasub at google.com>
Gerrit-Reviewer: Karthikeyan Ramasubramanian <kramasub at chromium.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181025/eadd9e33/attachment.html>
More information about the coreboot-gerrit
mailing list