Justin TerAvest has uploaded this change for review.

View Change

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: I8977090bdf07cd2f28265317a53dd82196a3fe9a
Signed-off-by: Justin TerAvest <teravest@chromium.org>
---
M src/mainboard/google/kahlee/variants/grunt/devicetree.cb
M src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
2 files changed, 9 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/23507/1
diff --git a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
index d2453a1..22c3653 100644
--- a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
@@ -81,6 +81,15 @@
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 900a838..4f91d72 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>

To view, visit change 23507. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8977090bdf07cd2f28265317a53dd82196a3fe9a
Gerrit-Change-Number: 23507
Gerrit-PatchSet: 1
Gerrit-Owner: Justin TerAvest <teravest@chromium.org>