diff options
| author | Justin TerAvest <teravest@chromium.org> | 2018-01-30 10:49:32 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2018-01-31 20:25:43 +0000 |
| commit | b1204aab86a0b93671e2ee33ede41459254363c0 (patch) | |
| tree | 89151d766d77a48b92e7f42a3f1c902b2c9ed293 | |
| parent | 215bc53117f81465d77d02ca6189e625a59318a6 (diff) | |
mb/google/kahlee: Add grunt trackpad in devicetree
This commit removes a manually written asl file in favor of configuring
the trackpad through devicetree.
BUG=b:72121803
TEST=cat /proc/interrupts with trackpad connected
Change-Id: I38afcf89ea64ffaf6a10bb317c41154feda57e50
Signed-off-by: Justin TerAvest <teravest@chromium.org>
Reviewed-on: https://review.coreboot.org/23508
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
3 files changed, 9 insertions, 39 deletions
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl deleted file mode 100644 index 11ec26fab2..0000000000 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2018 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -Device (ETPA) -{ - Name (_HID, "ELAN0000") - Name (_DDN, "Elan Touchpad") - Name (_UID, 1) - Name (ISTP, 1) /* Touchpad */ - - Name (_CRS, ResourceTemplate() - { - I2cSerialBus ( - 0x15, /* SlaveAddress */ - ControllerInitiated, /* SlaveMode */ - 400000, /* ConnectionSpeed */ - AddressingMode7Bit, /* AddressingMode */ - "\\_SB.I2CC", /* ResourceSource */ - ) - GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,, - "\\_SB.GPIO") { 0x5 } - }) - - /* Allow device to power off in S0 */ - Name (_S0W, 3) -} diff --git a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb index 91aa1f9182..a5864b8be9 100644 --- a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb @@ -82,6 +82,15 @@ chip soc/amd/stoneyridge device pci 18.4 on end device pci 18.5 on end end #domain + device mmio 0xfedc4000 on + chip drivers/i2c/generic + register "hid" = ""ELAN0000"" + register "desc" = ""ELAN Touchpad"" + register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_5)" + # TODO(teravest): Add wake + device i2c 15 on end + end + end device mmio 0xfedc5000 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl index 900a83888d..4f91d72822 100644 --- a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl @@ -15,4 +15,3 @@ #include <baseboard/acpi/mainboard.asl> #include <baseboard/acpi/audio.asl> -#include <baseboard/acpi/touchpad.asl> |