<p>Matt Delco has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27607">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ec/google/chromeec/acpi: Replace TBMC device with Intel Device<br><br>The TBMC device has a subset of the functionality of Intel's<br>Virtual Buttons device. Replacing the former with the latter<br>will help to avoid the need to support a separate and dedicated<br>driver in the future.<br><br>I tested on eve that a change works with a kernel that contains<br>a driver for the device.<br><br>Change-Id: Id486c540ecbb4c0b7a045e05405ef589aebe03c8<br>Signed-off-by: Matt Delco <delco@chromium.org><br>---<br>M src/ec/google/chromeec/acpi/ec.asl<br>D src/ec/google/chromeec/acpi/tbmc.asl<br>A src/ec/google/chromeec/acpi/vbtn.asl<br>3 files changed, 53 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/27607/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl</span><br><span>index 94917dd..36cfcde 100644</span><br><span>--- a/src/ec/google/chromeec/acpi/ec.asl</span><br><span>+++ b/src/ec/google/chromeec/acpi/ec.asl</span><br><span>@@ -375,7 +375,11 @@</span><br><span> \_SB.DPTF.TPET()</span><br><span> #endif</span><br><span> #ifdef EC_ENABLE_TBMC_DEVICE</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (TBMC, 0x80)</span><br><span style="color: hsl(120, 100%, 40%);">+ If (LEqual ((^TBMD), One)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Notify (VBTN, 0xCC)</span><br><span style="color: hsl(120, 100%, 40%);">+ } Else {</span><br><span style="color: hsl(120, 100%, 40%);">+ Notify (VBTN, 0xCD)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span>@@ -548,6 +552,6 @@</span><br><span> #endif</span><br><span> </span><br><span> #ifdef EC_ENABLE_TBMC_DEVICE</span><br><span style="color: hsl(0, 100%, 40%);">- #include "tbmc.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include "vbtn.asl"</span><br><span> #endif</span><br><span> }</span><br><span>diff --git a/src/ec/google/chromeec/acpi/tbmc.asl b/src/ec/google/chromeec/acpi/tbmc.asl</span><br><span>deleted file mode 100644</span><br><span>index 25a27ef1b..0000000</span><br><span>--- a/src/ec/google/chromeec/acpi/tbmc.asl</span><br><span>+++ /dev/null</span><br><span>@@ -1,29 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright 2017 Google Inc.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</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%);">-Device (TBMC)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_HID, "GOOG0006")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_UID, 1)</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_DDN, "Tablet Motion Control")</span><br><span style="color: hsl(0, 100%, 40%);">- Method (TBMC)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- If (LEqual (^^RCTM, One)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Return (0x1)</span><br><span style="color: hsl(0, 100%, 40%);">- } Else {</span><br><span style="color: hsl(0, 100%, 40%);">- Return (0x0)</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%);">-}</span><br><span>diff --git a/src/ec/google/chromeec/acpi/vbtn.asl b/src/ec/google/chromeec/acpi/vbtn.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..83eb092</span><br><span>--- /dev/null</span><br><span>+++ b/src/ec/google/chromeec/acpi/vbtn.asl</span><br><span>@@ -0,0 +1,47 @@</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 2017 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%);">+// VGBS reports 0x40 when NOT in tablet mode.</span><br><span style="color: hsl(120, 100%, 40%);">+// Device is sent event 0xCB/0xCC for tablet mode, 0xCA/0xCD for laptop mode</span><br><span style="color: hsl(120, 100%, 40%);">+Device (VBTN)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "INT33D6")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "Tablet Virtual Buttons")</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (_STA, 0, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (0x0f)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (VBDL, 0, Serialized)</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%);">+ Method (VGBS)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ If (LEqual (^^RCTM, One)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (0x0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } Else {</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (0x40)</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Device (VBTO)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "INT33D3")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CID, "PNP0C60")</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (_STA, 0, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (0x0f)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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/27607">change 27607</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/27607"/><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: Id486c540ecbb4c0b7a045e05405ef589aebe03c8 </div>
<div style="display:none"> Gerrit-Change-Number: 27607 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt Delco <delco@chromium.org> </div>