diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2018-01-26 10:40:09 -0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2018-01-30 20:20:36 +0000 |
| commit | c96ad868d4ad869523b615d90fb0bea4bd6d4ef6 (patch) | |
| tree | 76e5bdfdb499f702c86d7e72ad95fb2e852dae21 /src | |
| parent | ec91dd8feb16ea89d5a5d35b701bca09d1200afa (diff) | |
chromeec: Decouple EC tablet event and TBMC device
This change decouples EC tablet event and TBMC device by guarding
TBMC definition and notification using EC_ENABLE_TBMC_DEVICE. It
allows mainboards to use tablet events without having to define a TBMC
device.
BUG=b:72554519
Change-Id: Ie38b6d68486e8e644dd0d6d406def3ae7fdb5152
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/23461
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Diffstat (limited to 'src')
4 files changed, 8 insertions, 1 deletions
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index d295a8d580..618b00a79e 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -365,6 +365,8 @@ Device (EC0) If (CondRefOf (\_SB.DPTF.TPET)) { \_SB.DPTF.TPET() } +#endif +#ifdef EC_ENABLE_TBMC_DEVICE Notify (TBMC, 0x80) #endif } @@ -517,7 +519,7 @@ Device (EC0) #include "pd.asl" #endif -#ifdef EC_ENABLE_TABLET_EVENT +#ifdef EC_ENABLE_TBMC_DEVICE #include "tbmc.asl" #endif } diff --git a/src/mainboard/google/eve/ec.h b/src/mainboard/google/eve/ec.h index 81d591cb40..1b55248081 100644 --- a/src/mainboard/google/eve/ec.h +++ b/src/mainboard/google/eve/ec.h @@ -79,6 +79,8 @@ /* Enable Tablet switch */ #define EC_ENABLE_TABLET_EVENT +#define EC_ENABLE_TBMC_DEVICE + #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ #define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */ 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 ca9f865f19..70f12d5838 100644 --- a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h +++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h @@ -72,6 +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 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 1f91c1e6b9..ff32ff6b52 100644 --- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h @@ -74,6 +74,8 @@ /* Enable Tablet switch */ #define EC_ENABLE_TABLET_EVENT +#define EC_ENABLE_TBMC_DEVICE + #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ #define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */ |