<p>David Wu has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28965">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/fizz: Provide nhlt variant API<br><br>Move current NHLT configuration implementation to baseboard so that<br>variants can leverage it or provide their own configuration.<br><br>BUG=b:117066935<br>BRANCH=Fizz<br>TEST=emerge-fizz coreboot<br><br>Change-Id: I30d93babb6fc09e8642b3740f1f7638fa33f0ade<br>Signed-off-by: David Wu <david_wu@quanta.corp-partner.google.com><br>---<br>M src/mainboard/google/fizz/mainboard.c<br>M src/mainboard/google/fizz/variants/baseboard/Makefile.inc<br>M src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h<br>A src/mainboard/google/fizz/variants/baseboard/nhlt.c<br>4 files changed, 47 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/28965/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c</span><br><span>index 9865f40..e9d9aef 100644</span><br><span>--- a/src/mainboard/google/fizz/mainboard.c</span><br><span>+++ b/src/mainboard/google/fizz/mainboard.c</span><br><span>@@ -14,7 +14,7 @@</span><br><span> */</span><br><span> </span><br><span> #include <arch/acpi.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/variants.h></span><br><span> #include <chip.h></span><br><span> #include <device/device.h></span><br><span> #include <ec/ec.h></span><br><span>@@ -194,8 +194,9 @@</span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span> struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *oem_id = "GOOGLE";</span><br><span style="color: hsl(0, 100%, 40%);">- const char *oem_table_id = "FIZZ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *oem_id = "NULL";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *oem_table_id = "NULL";</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t oem_revision = 0;</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span> struct nhlt *nhlt;</span><br><span>@@ -206,12 +207,11 @@</span><br><span> if (!nhlt)</span><br><span> return start_addr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* RT5663 Headset codec */</span><br><span style="color: hsl(0, 100%, 40%);">- if (nhlt_soc_add_rt5663(nhlt, AUDIO_LINK_SSP1))</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "Couldn't add headset codec.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ variant_nhlt_init(nhlt);</span><br><span style="color: hsl(120, 100%, 40%);">+ variant_nhlt_oem_overrides(&oem_id, &oem_table_id, &oem_revision);</span><br><span> </span><br><span> end_addr = nhlt_soc_serialize_oem_overrides(nhlt, start_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- oem_id, oem_table_id, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ oem_id, oem_table_id, oem_revision);</span><br><span> </span><br><span> if (end_addr != start_addr)</span><br><span> acpi_add_table(rsdp, (void *)start_addr);</span><br><span>diff --git a/src/mainboard/google/fizz/variants/baseboard/Makefile.inc b/src/mainboard/google/fizz/variants/baseboard/Makefile.inc</span><br><span>index 9fb63f5..0ad298b 100644</span><br><span>--- a/src/mainboard/google/fizz/variants/baseboard/Makefile.inc</span><br><span>+++ b/src/mainboard/google/fizz/variants/baseboard/Makefile.inc</span><br><span>@@ -1,3 +1,4 @@</span><br><span> bootblock-y += gpio.c</span><br><span> </span><br><span> ramstage-y += gpio.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += nhlt.c</span><br><span>diff --git a/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h</span><br><span>index 52615be..db5be5f 100644</span><br><span>--- a/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -32,4 +32,9 @@</span><br><span> </span><br><span> const struct cros_gpio *variant_cros_gpios(size_t *num);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct nhlt;</span><br><span style="color: hsl(120, 100%, 40%);">+void variant_nhlt_init(struct nhlt *nhlt);</span><br><span style="color: hsl(120, 100%, 40%);">+void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t *oem_revision);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* __BASEBOARD_VARIANTS_H__ */</span><br><span>diff --git a/src/mainboard/google/fizz/variants/baseboard/nhlt.c b/src/mainboard/google/fizz/variants/baseboard/nhlt.c</span><br><span>new file mode 100644</span><br><span>index 0000000..b443bb5</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/fizz/variants/baseboard/nhlt.c</span><br><span>@@ -0,0 +1,34 @@</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%);">+#include <baseboard/variants.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <nhlt.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/nhlt.h></span><br><span style="color: hsl(120, 100%, 40%);">+void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt)</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%);">+ /* RT5663 Headset codec */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nhlt_soc_add_rt5663(nhlt, AUDIO_LINK_SSP1))</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Couldn't add headset codec.\n");</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%);">+void __attribute__((weak)) variant_nhlt_oem_overrides(const char **oem_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char **oem_table_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t *oem_revision)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *oem_id = "GOOGLE";</span><br><span style="color: hsl(120, 100%, 40%);">+ *oem_table_id = "FIZZ";</span><br><span style="color: hsl(120, 100%, 40%);">+ *oem_revision = 0;</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/28965">change 28965</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/28965"/><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: I30d93babb6fc09e8642b3740f1f7638fa33f0ade </div>
<div style="display:none"> Gerrit-Change-Number: 28965 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: David Wu <david_wu@quanta.corp-partner.google.com> </div>