<p>Daniel Kurtz would like Daniel Kurtz to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/23232">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/kahlee/acpi: populate kahlee and grunt touchpad .asl as variants<br><br>Grunt and Kahlee touchpads are on different i2c busses; I2CC and I2CD,<br>respectively.<br><br>BUG=b:71820409<br>TEST=Boot grunt to kernel, use evtest to test trackpad.<br>TEST=Boot kahlee to kernel, use evtest to test trackpad.<br><br>Change-Id: I1aeacf9a840342e73c1e219a825b39a124b4dd57<br>Signed-off-by: Daniel Kurtz <djkurtz@chromium.org><br>---<br>M src/mainboard/google/kahlee/acpi/mainboard.asl<br>A src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl<br>A src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl<br>A src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl<br>4 files changed, 93 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/23232/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/acpi/mainboard.asl</span><br><span>index 30b7ade..7ed8dd4 100644</span><br><span>--- a/src/mainboard/google/kahlee/acpi/mainboard.asl</span><br><span>+++ b/src/mainboard/google/kahlee/acpi/mainboard.asl</span><br><span>@@ -32,29 +32,7 @@</span><br><span> Name (OSV, Ones) /* Assume nothing */</span><br><span> Name (PMOD, One) /* Assume APIC */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Device (ETPA)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_HID, "ELAN0000")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_DDN, "Elan Touchpad")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_UID, 1)</span><br><span style="color: hsl(0, 100%, 40%);">- Name (ISTP, 1) /* Touchpad */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_CRS, ResourceTemplate()</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- I2cSerialBus (</span><br><span style="color: hsl(0, 100%, 40%);">- 0x15, /* SlaveAddress */</span><br><span style="color: hsl(0, 100%, 40%);">- ControllerInitiated, /* SlaveMode */</span><br><span style="color: hsl(0, 100%, 40%);">- 400000, /* ConnectionSpeed */</span><br><span style="color: hsl(0, 100%, 40%);">- AddressingMode7Bit, /* AddressingMode */</span><br><span style="color: hsl(0, 100%, 40%);">- "\\_SB.I2CD", /* ResourceSource */</span><br><span style="color: hsl(0, 100%, 40%);">- )</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(0, 100%, 40%);">- "\\_SB.GPIO") { 0x5 }</span><br><span style="color: hsl(0, 100%, 40%);">- })</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Allow device to power off in S0 */</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_S0W, 3)</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#include <variant/touchpad.asl></span><br><span> </span><br><span> /* Realtek Audio Codec */</span><br><span> Device (RTEK) /* Audio Codec driver I2CS*/</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..11ec26f</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/touchpad.asl</span><br><span>@@ -0,0 +1,38 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Device (ETPA)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "ELAN0000")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "Elan Touchpad")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_UID, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (ISTP, 1) /* Touchpad */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CRS, ResourceTemplate()</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ I2cSerialBus (</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x15, /* SlaveAddress */</span><br><span style="color: hsl(120, 100%, 40%);">+ ControllerInitiated, /* SlaveMode */</span><br><span style="color: hsl(120, 100%, 40%);">+ 400000, /* ConnectionSpeed */</span><br><span style="color: hsl(120, 100%, 40%);">+ AddressingMode7Bit, /* AddressingMode */</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.I2CC", /* ResourceSource */</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPIO") { 0x5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allow device to power off in S0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_S0W, 3)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..dfc9607</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/touchpad.asl</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/touchpad.asl></span><br><span>\ No newline at end of file</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..2babaf2</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/touchpad.asl</span><br><span>@@ -0,0 +1,38 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Device (ETPA)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "ELAN0000")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "Elan Touchpad")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_UID, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (ISTP, 1) /* Touchpad */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CRS, ResourceTemplate()</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ I2cSerialBus (</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x15, /* SlaveAddress */</span><br><span style="color: hsl(120, 100%, 40%);">+ ControllerInitiated, /* SlaveMode */</span><br><span style="color: hsl(120, 100%, 40%);">+ 400000, /* ConnectionSpeed */</span><br><span style="color: hsl(120, 100%, 40%);">+ AddressingMode7Bit, /* AddressingMode */</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.I2CD", /* ResourceSource */</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPIO") { 0x5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allow device to power off in S0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_S0W, 3)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23232">change 23232</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23232"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1aeacf9a840342e73c1e219a825b39a124b4dd57 </div>
<div style="display:none"> Gerrit-Change-Number: 23232 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daniel Kurtz <djkurtz@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Daniel Kurtz <djkurtz@chromium.org> </div>