<p>Daniel Kurtz would like Daniel Kurtz to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/23234">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/kahlee/acpi: populate kahlee and grunt audio codec .asl as variants<br><br>Grunt and Kahlee have different audio codecs.<br>Describe them in separate .asl variant files.<br><br>BUG=b:71772141<br>TEST=Boot kahlee to kernel, audio works.<br>TEST=Boot grunt to kernel, no messages like:<br> i2c_designware AMD0010:00: controller timed out<br><br>Change-Id: I0d1407286ff8d8ba2f533b6bc7b323d38cdf6b23<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/grunt/include/variant/audio.asl<br>A src/mainboard/google/kahlee/variants/kahlee/include/variant/audio.asl<br>3 files changed, 125 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/23234/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 7ed8dd4..1640ef6 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>@@ -33,44 +33,4 @@</span><br><span> Name (PMOD, One) /* Assume APIC */</span><br><span> </span><br><span> #include <variant/touchpad.asl></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Realtek Audio Codec */</span><br><span style="color: hsl(0, 100%, 40%);">-Device (RTEK) /* Audio Codec driver I2CS*/</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_ADR, 0)</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_HID, "10EC5650")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_CID, "10EC5650")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_DDN, "RTEK Codec Controller ")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_UID, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- Device (I2S) /* I2S machine driver for RT5650 */</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_ADR, 1)</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_HID, "AMDI1002")</span><br><span style="color: hsl(0, 100%, 40%);">- Name (_CID, "AMDI1002")</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%);">- Method (_CRS, 0x0, Serialized)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- Name (SBUF, 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%);">- 0x1A, /* SlaveAddress: bus address */</span><br><span style="color: hsl(0, 100%, 40%);">- ControllerInitiated, /* SlaveMode: default to ControllerInitiated */</span><br><span style="color: hsl(0, 100%, 40%);">- 400000, /* ConnectionSpeed: in Hz */</span><br><span style="color: hsl(0, 100%, 40%);">- AddressingMode7Bit, /* Addressing Mode: default to 7 bit */</span><br><span style="color: hsl(0, 100%, 40%);">- "\\_SB.I2CA", /* ResourceSource: I2C bus controller name */</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%);">- /* Jack Detect AGPIO90 */</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(0, 100%, 40%);">- "\\_SB.GPIO") { 90 }</span><br><span style="color: hsl(0, 100%, 40%);">- })</span><br><span style="color: hsl(0, 100%, 40%);">- Return (SBUF)</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%);">- Method (_STA)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- Return (0xF)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#include <variant/audio.asl></span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/audio.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/audio.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..98c2dc7</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/audio.asl</span><br><span>@@ -0,0 +1,69 @@</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%);">+/* DA7219 codec */</span><br><span style="color: hsl(120, 100%, 40%);">+Device (DIAL) /* audio codec*/</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_ADR, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "DLGS7219")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CID, "DLGS7219")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "DA7219 Codec Controller ")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_UID, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Device (I2S) /* I2S machine driver for RT5650 */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_ADR, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "AMDI7219")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CID, "AMDI7219")</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 (_CRS, 0x0, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (SBUF, 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%);">+ 0x1A, /* SlaveAddress: bus address */</span><br><span style="color: hsl(120, 100%, 40%);">+ ControllerInitiated, /* SlaveMode: default to ControllerInitiated */</span><br><span style="color: hsl(120, 100%, 40%);">+ 400000, /* ConnectionSpeed: in Hz */</span><br><span style="color: hsl(120, 100%, 40%);">+ AddressingMode7Bit, /* Addressing Mode: default to 7 bit */</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.I2CA", /* ResourceSource: I2C bus controller name */</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%);">+ /* Jack Detect AGPIO14 */</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPIO") { 14 }</span><br><span style="color: hsl(120, 100%, 40%);">+ })</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (SBUF)</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 (_STA)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (0xF)</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%);">+/* MAX98357 codec */</span><br><span style="color: hsl(120, 100%, 40%);">+Device (MAXA)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_ADR, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "MX98357A")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CID, "MX98357A")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "MX98357A Codec Controller ")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_UID, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (_STA, 0x0, NotSerialized) {</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>diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/audio.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/audio.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..031eafc</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/audio.asl</span><br><span>@@ -0,0 +1,55 @@</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%);">+/* Realtek Audio Codec */</span><br><span style="color: hsl(120, 100%, 40%);">+Device (RTEK) /* Audio Codec driver I2CS*/</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_ADR, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "10EC5650")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CID, "10EC5650")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "RTEK Codec Controller ")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_UID, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Device (I2S) /* I2S machine driver for RT5650 */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_ADR, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "AMDI1002")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CID, "AMDI1002")</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 (_CRS, 0x0, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (SBUF, 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%);">+ 0x1A, /* SlaveAddress: bus address */</span><br><span style="color: hsl(120, 100%, 40%);">+ ControllerInitiated, /* SlaveMode: default to ControllerInitiated */</span><br><span style="color: hsl(120, 100%, 40%);">+ 400000, /* ConnectionSpeed: in Hz */</span><br><span style="color: hsl(120, 100%, 40%);">+ AddressingMode7Bit, /* Addressing Mode: default to 7 bit */</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.I2CA", /* ResourceSource: I2C bus controller name */</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%);">+ /* Jack Detect AGPIO90 */</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPIO") { 90 }</span><br><span style="color: hsl(120, 100%, 40%);">+ })</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (SBUF)</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 (_STA)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (0xF)</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/23234">change 23234</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/23234"/><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: I0d1407286ff8d8ba2f533b6bc7b323d38cdf6b23 </div>
<div style="display:none"> Gerrit-Change-Number: 23234 </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>