Matt Delco has uploaded this change for review. ( https://review.coreboot.org/27608
Change subject: src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_ ......................................................................
src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_
The TBMC device was replaced with a different tablet device. This change renames the instances of EC_ENABLE_TBMC_DEVICE to be a more generic EC_ENABLE_TABLET_DEVICE.
Change-Id: Ie1e99ff6a9689dc9fc0236f060cb7d6da8821c11 Signed-off-by: Matt Delco delco@chromium.org --- M src/ec/google/chromeec/acpi/ec.asl M src/mainboard/google/eve/ec.h M src/mainboard/google/octopus/variants/phaser/include/variant/ec.h M src/mainboard/google/octopus/variants/yorp/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/reef/variants/baseboard/include/baseboard/ec.h 7 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/27608/1
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 36cfcde..1e13a95 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -374,7 +374,7 @@ #ifdef EC_ENABLE_TABLET_EVENT _SB.DPTF.TPET() #endif -#ifdef EC_ENABLE_TBMC_DEVICE +#ifdef EC_ENABLE_TABLET_DEVICE If (LEqual ((^TBMD), One)) { Notify (VBTN, 0xCC) } Else { @@ -551,7 +551,7 @@ #include "pd.asl" #endif
-#ifdef EC_ENABLE_TBMC_DEVICE +#ifdef EC_ENABLE_TABLET_DEVICE #include "vbtn.asl" #endif } diff --git a/src/mainboard/google/eve/ec.h b/src/mainboard/google/eve/ec.h index 1b55248..0f3117f 100644 --- a/src/mainboard/google/eve/ec.h +++ b/src/mainboard/google/eve/ec.h @@ -79,7 +79,7 @@ /* Enable Tablet switch */ #define EC_ENABLE_TABLET_EVENT
-#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ diff --git a/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h b/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h index 48cb584..00b9efb 100644 --- a/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h +++ b/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h @@ -19,6 +19,6 @@ #include <baseboard/ec.h>
/* Enable Tablet switch */ -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE
#endif diff --git a/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h b/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h index 48cb584..00b9efb 100644 --- a/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h +++ b/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h @@ -19,6 +19,6 @@ #include <baseboard/ec.h>
/* Enable Tablet switch */ -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE
#endif 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..72625d5 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/ec.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/ec.h @@ -70,7 +70,7 @@
/* Enable Tablet switch */ #define EC_ENABLE_TABLET_EVENT -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface 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..5d15adb 100644 --- a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h +++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h @@ -72,7 +72,7 @@ #define EC_ENABLE_LID_SWITCH #define EC_ENABLE_WAKE_PIN GPE_EC_WAKE #define EC_ENABLE_TABLET_EVENT -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ diff --git a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h index 6e1de7a..f89afd8 100644 --- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h @@ -71,7 +71,7 @@ #define EC_ENABLE_LID_SWITCH #define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
-#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
-
Matt Delco (Code Review)