diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2017-01-12 11:38:06 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-01-17 17:55:58 +0100 |
| commit | e7dbeaeac3f9e37625a5b4cda04e67597972e4ee (patch) | |
| tree | ea3233c89b49e12df22295bff4cdbf467d48402b /src/mainboard/google/ninja | |
| parent | e8c527e5404d0c8944d84f5c89f308483af22560 (diff) | |
google/enguarde,ninja: Prep for variant merge
Minor cleanup for enguarde and ninja devices:
- enguarde: correct trackpad I2C slave address
- enguarde: remove unused trackpad ACPI devices
- ninja: remove unused PS2 keyboard ACPI device
Change-Id: I1beb34059ba318e2d496a59e4b482f3462faf232
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/18128
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/mainboard/google/ninja')
| -rw-r--r-- | src/mainboard/google/ninja/acpi/superio.asl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mainboard/google/ninja/acpi/superio.asl b/src/mainboard/google/ninja/acpi/superio.asl index 15b8062c6c..92abb1261e 100644 --- a/src/mainboard/google/ninja/acpi/superio.asl +++ b/src/mainboard/google/ninja/acpi/superio.asl @@ -17,11 +17,9 @@ #include <mainboard/google/ninja/ec.h> #include <mainboard/google/ninja/onboard.h> -#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 -// Override default IRQ settings -#define SIO_EC_PS2K_IRQ Interrupt(ResourceConsumer, Edge, ActiveLow) {BOARD_I8042_IRQ} +#define SIO_EC_MEMMAP_ENABLE // EC Memory Map Resources +#define SIO_EC_HOST_ENABLE // EC Host Interface Resources +#undef SIO_EC_ENABLE_PS2K // Disable PS/2 Keyboard /* ACPI code for EC SuperIO functions */ #include <ec/google/chromeec/acpi/superio.asl> |