diff options
| author | Karthikeyan Ramasubramanian <kramasub@chromium.org> | 2018-11-14 08:53:01 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2018-11-15 19:57:56 +0000 |
| commit | 017b5c453a72f57ec785da1764939e24651ac5eb (patch) | |
| tree | 3fc2d39b3e2807856791cdd279aa8c28efa8390e | |
| parent | b6892969cb79ac9d35a6b00a9de9093bb88378d2 (diff) | |
| download | coreboot-017b5c453a72f57ec785da1764939e24651ac5eb.tar.xz | |
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.
BUG=b:118149364
BRANCH=None
TEST=Ensured that the expected DPTF table are loaded in different
modes (base attached/detached and clamshell/360-flipped) on Soraka and
Nautilus.
Change-Id: If147f1c79ceaaed00e17ec80ec6c912a8f7a8c2e
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/29261
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
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 } |