<p>Zhuohao Lee has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27805">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/rammus: add audio, mic and codec configuration<br><br>Rammus uses DA7219 Headset, Maxim MAX98927 Smart Amps and 4 channel dmic<br><br>BUG=b:111579386<br>BRANCH=Master<br>TEST=Build pass<br><br>Change-Id: If21a3870ee4b000a776d2f3e025fb43ef2fe48c7<br>Signed-off-by: Zhuohao Lee <zhuohao@chromium.org><br>---<br>M src/mainboard/google/poppy/Kconfig<br>M src/mainboard/google/poppy/variants/rammus/Makefile.inc<br>A src/mainboard/google/poppy/variants/rammus/nhlt.c<br>3 files changed, 52 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/27805/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig</span><br><span>index 9a75d9c..2ca0f96 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -86,6 +86,12 @@</span><br><span> select NHLT_DMIC_4CH</span><br><span> select NHLT_MAX98373</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config INCLUDE_NHLT_BLOBS_RAMMUS</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Include blobs for rammus audio."</span><br><span style="color: hsl(120, 100%, 40%);">+ select NHLT_DA7219</span><br><span style="color: hsl(120, 100%, 40%);">+ select NHLT_DMIC_4CH</span><br><span style="color: hsl(120, 100%, 40%);">+ select NHLT_MAX98927</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span> default "google/poppy"</span><br><span>@@ -186,6 +192,8 @@</span><br><span> config VARIANT_SPECIFIC_OPTIONS_RAMMUS</span><br><span> def_bool n</span><br><span> select CHROMEOS_WIFI_SAR if CHROMEOS</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_I2C_MAX98927</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_I2C_DA7219</span><br><span> select MAINBOARD_HAS_SPI_TPM_CR50</span><br><span> </span><br><span> config VARIANT_SPECIFIC_OPTIONS_SORAKA</span><br><span>diff --git a/src/mainboard/google/poppy/variants/rammus/Makefile.inc b/src/mainboard/google/poppy/variants/rammus/Makefile.inc</span><br><span>index f24f8a7..98464af 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/rammus/Makefile.inc</span><br><span>+++ b/src/mainboard/google/poppy/variants/rammus/Makefile.inc</span><br><span>@@ -1 +1,2 @@</span><br><span> SPD_SOURCES = empty # 0b0000</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += nhlt.c</span><br><span>diff --git a/src/mainboard/google/poppy/variants/rammus/nhlt.c b/src/mainboard/google/poppy/variants/rammus/nhlt.c</span><br><span>new file mode 100644</span><br><span>index 0000000..70c2524</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/rammus/nhlt.c</span><br><span>@@ -0,0 +1,43 @@</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 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/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%);">+</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%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 4 Channel DMIC array. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nhlt_soc_add_dmic_array(nhlt, 4))</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Couldn't add 4CH DMIC array.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Dialog DA7219 Headset codec. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP1))</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Couldn't add Dialog DA7219.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Maxim MAX98927 Smart Amps for left and right channel */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0))</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Couldn't add Maxim MAX98927\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%);">+</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 style="color: hsl(120, 100%, 40%);">+ *oem_id = "GOOGLE";</span><br><span style="color: hsl(120, 100%, 40%);">+ *oem_table_id = "RAMMUSMAX";</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/27805">change 27805</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/27805"/><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: If21a3870ee4b000a776d2f3e025fb43ef2fe48c7 </div>
<div style="display:none"> Gerrit-Change-Number: 27805 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Zhuohao Lee <zhuohao@chromium.org> </div>