Matt DeVillier (matt.devillier@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18128
-gerrit
commit 29109eafca96e20f93618d1e93f52d90d06785ad Author: Matt DeVillier matt.devillier@gmail.com Date: Thu Jan 12 11:38:06 2017 -0600
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 --- src/mainboard/google/enguarde/acpi/mainboard.asl | 80 ++---------------------- src/mainboard/google/enguarde/onboard.h | 2 +- src/mainboard/google/ninja/acpi/superio.asl | 8 +-- 3 files changed, 9 insertions(+), 81 deletions(-)
diff --git a/src/mainboard/google/enguarde/acpi/mainboard.asl b/src/mainboard/google/enguarde/acpi/mainboard.asl index 01868e4..9396485 100644 --- a/src/mainboard/google/enguarde/acpi/mainboard.asl +++ b/src/mainboard/google/enguarde/acpi/mainboard.asl @@ -65,76 +65,6 @@ Scope (_SB)
Scope (_SB.I2C1) { - Device (ATPB) - { - Name (_HID, "ATML0000") - Name (_DDN, "Atmel Touchpad Bootloader") - Name (_UID, 1) - Name (ISTP, 1) /* Touchpad */ - - Name (_CRS, ResourceTemplate() - { - I2cSerialBus ( - 0x25, // SlaveAddress - ControllerInitiated, // SlaveMode - 400000, // ConnectionSpeed - AddressingMode7Bit, // AddressingMode - "\_SB.I2C1", // ResourceSource - ) - Interrupt (ResourceConsumer, Edge, ActiveLow) - { - BOARD_TRACKPAD_IRQ - } - }) - - Method (_STA) - { - If (LEqual (\S1EN, 1)) { - Return (0xF) - } Else { - Return (0x0) - } - } - - /* Allow device to power off in S0 */ - Name (_S0W, 4) - } - - Device (ATPA) - { - Name (_HID, "ATML0000") - Name (_DDN, "Atmel Touchpad") - Name (_UID, 2) - Name (ISTP, 1) /* Touchpad */ - - Name (_CRS, ResourceTemplate() - { - I2cSerialBus ( - 0x4b, // SlaveAddress - ControllerInitiated, // SlaveMode - 400000, // ConnectionSpeed - AddressingMode7Bit, // AddressingMode - "\_SB.I2C1", // ResourceSource - ) - Interrupt (ResourceConsumer, Edge, ActiveLow) - { - BOARD_TRACKPAD_IRQ - } - }) - - Method (_STA) - { - If (LEqual (\S1EN, 1)) { - Return (0xF) - } Else { - Return (0x0) - } - } - - /* Allow device to power off in S0 */ - Name (_S0W, 4) - } - Device (ETPA) { Name (_HID, "ELAN0000") @@ -145,11 +75,11 @@ Scope (_SB.I2C1) Name (_CRS, ResourceTemplate() { I2cSerialBus ( - 0x15, // SlaveAddress - ControllerInitiated, // SlaveMode - 400000, // ConnectionSpeed - AddressingMode7Bit, // AddressingMode - "\_SB.I2C1", // ResourceSource + BOARD_TRACKPAD_I2C_ADDR, // SlaveAddress + ControllerInitiated, // SlaveMode + 400000, // ConnectionSpeed + AddressingMode7Bit, // AddressingMode + "\_SB.I2C1", // ResourceSource ) Interrupt (ResourceConsumer, Edge, ActiveLow) { diff --git a/src/mainboard/google/enguarde/onboard.h b/src/mainboard/google/enguarde/onboard.h index e10e4bf..3fda837 100644 --- a/src/mainboard/google/enguarde/onboard.h +++ b/src/mainboard/google/enguarde/onboard.h @@ -25,7 +25,7 @@ #define BOARD_TRACKPAD_IRQ GPIO_S0_DED_IRQ(TPAD_IRQ_OFFSET) #define BOARD_TRACKPAD_WAKE_GPIO ACPI_ENABLE_WAKE_SUS_GPIO(1) #define BOARD_TRACKPAD_I2C_BUS 0 -#define BOARD_TRACKPAD_I2C_ADDR 0x4b +#define BOARD_TRACKPAD_I2C_ADDR 0x15
#define BOARD_I8042_IRQ GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET) #define BOARD_CODEC_IRQ GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET) diff --git a/src/mainboard/google/ninja/acpi/superio.asl b/src/mainboard/google/ninja/acpi/superio.asl index 15b8062..92abb12 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>