[coreboot-gerrit] Change in coreboot[master]: google/kahlee/acpi: populate kahlee and grunt touchpad .asl as variants
Daniel Kurtz (Code Review)
gerrit at coreboot.org
Fri Jan 12 03:50:23 CET 2018
Hello Daniel Kurtz,
I'd like you to do a code review. Please visit
https://review.coreboot.org/23232
to review the following change.
Change subject: google/kahlee/acpi: populate kahlee and grunt touchpad .asl as variants
......................................................................
google/kahlee/acpi: populate kahlee and grunt touchpad .asl as variants
Grunt and Kahlee touchpads are on different i2c busses; I2CC and I2CD,
respectively.
BUG=b:71820409
TEST=Boot grunt to kernel, use evtest to test trackpad.
TEST=Boot kahlee to kernel, use evtest to test trackpad.
Change-Id: I1aeacf9a840342e73c1e219a825b39a124b4dd57
Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
---
M src/mainboard/google/kahlee/acpi/mainboard.asl
A src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl
A src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl
A src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl
4 files changed, 93 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/23232/1
diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/acpi/mainboard.asl
index 30b7ade..7ed8dd4 100644
--- a/src/mainboard/google/kahlee/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/acpi/mainboard.asl
@@ -32,29 +32,7 @@
Name (OSV, Ones) /* Assume nothing */
Name (PMOD, One) /* Assume APIC */
-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.I2CD", /* ResourceSource */
- )
- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,
- "\\_SB.GPIO") { 0x5 }
- })
-
- /* Allow device to power off in S0 */
- Name (_S0W, 3)
-}
+#include <variant/touchpad.asl>
/* Realtek Audio Codec */
Device (RTEK) /* Audio Codec driver I2CS*/
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl
new file mode 100644
index 0000000..11ec26f
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl
@@ -0,0 +1,38 @@
+/*
+ * 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/include/variant/touchpad.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl
new file mode 100644
index 0000000..dfc9607
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+#include <baseboard/touchpad.asl>
\ No newline at end of file
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl
new file mode 100644
index 0000000..2babaf2
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl
@@ -0,0 +1,38 @@
+/*
+ * 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.I2CD", /* ResourceSource */
+ )
+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,
+ "\\_SB.GPIO") { 0x5 }
+ })
+
+ /* Allow device to power off in S0 */
+ Name (_S0W, 3)
+}
--
To view, visit https://review.coreboot.org/23232
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aeacf9a840342e73c1e219a825b39a124b4dd57
Gerrit-Change-Number: 23232
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Kurtz <djkurtz at google.com>
Gerrit-Reviewer: Daniel Kurtz <djkurtz at chromium.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180112/b633a403/attachment-0001.html>
More information about the coreboot-gerrit
mailing list