<p>Naveen Manohar has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26057">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: add rt5682 NHLT support<br><br>Add APIs and required parameters for creating Realtek 5682 SSP<br>endpoint in NHLT table.<br><br>BUG=b:79235534<br>TEST=check that NHLT table defined is created properly.<br>With the series merged & required driver support in kernel.<br>Verify Headset Audio playback.<br><br>Change-Id: Ic26a0b881f77af64ba00fd714b08c0f17c0acb3d<br>Signed-off-by: Naveen Manohar <naveen.m@intel.com><br>---<br>M src/mainboard/intel/glkrvp/Kconfig<br>M src/soc/intel/apollolake/Makefile.inc<br>M src/soc/intel/apollolake/include/soc/nhlt.h<br>M src/soc/intel/apollolake/nhlt.c<br>4 files changed, 61 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/57/26057/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig</span><br><span>index 3451640..7b72412 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/Kconfig</span><br><span>+++ b/src/mainboard/intel/glkrvp/Kconfig</span><br><span>@@ -87,6 +87,7 @@</span><br><span> select NHLT_DMIC_4CH_16B</span><br><span> select NHLT_DA7219</span><br><span> select NHLT_MAX98357</span><br><span style="color: hsl(120, 100%, 40%);">+ select NHLT_RT5682</span><br><span> </span><br><span> config IS_GLK_RVP_1</span><br><span> bool "Is this RVP1?"</span><br><span>diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc</span><br><span>index 5c060ad..9b09b09 100644</span><br><span>--- a/src/soc/intel/apollolake/Makefile.inc</span><br><span>+++ b/src/soc/intel/apollolake/Makefile.inc</span><br><span>@@ -151,6 +151,7 @@</span><br><span> DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin</span><br><span> MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin</span><br><span> DA7219_RENDER_CAPTURE = dialog-2ch-48khz-24b.bin</span><br><span style="color: hsl(120, 100%, 40%);">+RT5682_RENDER_CAPTURE = rt5682-2ch-48khz-24b.bin</span><br><span> </span><br><span> cbfs-files-$(CONFIG_NHLT_DMIC_1CH_16B) += $(DMIC_1CH_48KHZ_16B)</span><br><span> $(DMIC_1CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_1CH_48KHZ_16B)</span><br><span>@@ -172,4 +173,8 @@</span><br><span> $(DA7219_RENDER_CAPTURE)-file := $(NHLT_BLOB_PATH)/$(DA7219_RENDER_CAPTURE)</span><br><span> $(DA7219_RENDER_CAPTURE)-type := raw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+cbfs-files-$(CONFIG_NHLT_RT5682) += $(RT5682_RENDER_CAPTURE)</span><br><span style="color: hsl(120, 100%, 40%);">+$(RT5682_RENDER_CAPTURE)-file := $(NHLT_BLOB_PATH)/$(RT5682_RENDER_CAPTURE)</span><br><span style="color: hsl(120, 100%, 40%);">+$(RT5682_RENDER_CAPTURE)-type := raw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/src/soc/intel/apollolake/include/soc/nhlt.h b/src/soc/intel/apollolake/include/soc/nhlt.h</span><br><span>index d49b8cf..226fc8a 100644</span><br><span>--- a/src/soc/intel/apollolake/include/soc/nhlt.h</span><br><span>+++ b/src/soc/intel/apollolake/include/soc/nhlt.h</span><br><span>@@ -39,5 +39,6 @@</span><br><span> int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels);</span><br><span> int nhlt_soc_add_max98357(struct nhlt *nhlt, int hwlink);</span><br><span> int nhlt_soc_add_da7219(struct nhlt *nhlt, int hwlink);</span><br><span style="color: hsl(120, 100%, 40%);">+int nhlt_soc_add_rt5682(struct nhlt *nhlt, int hwlink);</span><br><span> </span><br><span> #endif</span><br><span>diff --git a/src/soc/intel/apollolake/nhlt.c b/src/soc/intel/apollolake/nhlt.c</span><br><span>index a86da88..a46b188 100644</span><br><span>--- a/src/soc/intel/apollolake/nhlt.c</span><br><span>+++ b/src/soc/intel/apollolake/nhlt.c</span><br><span>@@ -197,6 +197,53 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * The same DSP firmware settings are used for both the capture and</span><br><span style="color: hsl(120, 100%, 40%);">+ * render endpoints.</span><br><span style="color: hsl(120, 100%, 40%);">+*/</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct nhlt_format_config rt5682_formats[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48 KHz 24-bits per sample. */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_channels = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sample_freq_khz = 48,</span><br><span style="color: hsl(120, 100%, 40%);">+ .container_bits_per_sample = 32,</span><br><span style="color: hsl(120, 100%, 40%);">+ .valid_bits_per_sample = 24,</span><br><span style="color: hsl(120, 100%, 40%);">+ .speaker_mask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT,</span><br><span style="color: hsl(120, 100%, 40%);">+ .settings_file = "rt5682-2ch-48khz-24b.bin",</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%);">+ * The rt5682 just has headphones and a mic. Both the capture and render</span><br><span style="color: hsl(120, 100%, 40%);">+ * endpoints occupy the same virtual slot.</span><br><span style="color: hsl(120, 100%, 40%);">+*/</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct nhlt_endp_descriptor rt5682_descriptors[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Render Endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .link = NHLT_LINK_SSP,</span><br><span style="color: hsl(120, 100%, 40%);">+ .device = NHLT_SSP_DEV_I2S,</span><br><span style="color: hsl(120, 100%, 40%);">+ .direction = NHLT_DIR_RENDER,</span><br><span style="color: hsl(120, 100%, 40%);">+ .vid = NHLT_VID,</span><br><span style="color: hsl(120, 100%, 40%);">+ .did = NHLT_DID_SSP,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cfg = &tdm_config,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cfg_size = sizeof(tdm_config),</span><br><span style="color: hsl(120, 100%, 40%);">+ .formats = rt5682_formats,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_formats = ARRAY_SIZE(rt5682_formats),</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Capture Endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .link = NHLT_LINK_SSP,</span><br><span style="color: hsl(120, 100%, 40%);">+ .device = NHLT_SSP_DEV_I2S,</span><br><span style="color: hsl(120, 100%, 40%);">+ .direction = NHLT_DIR_CAPTURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .vid = NHLT_VID,</span><br><span style="color: hsl(120, 100%, 40%);">+ .did = NHLT_DID_SSP,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cfg = &tdm_config,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cfg_size = sizeof(tdm_config),</span><br><span style="color: hsl(120, 100%, 40%);">+ .formats = rt5682_formats,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_formats = ARRAY_SIZE(rt5682_formats),</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> int nhlt_soc_add_da7219(struct nhlt *nhlt, int hwlink)</span><br><span> {</span><br><span> /* Virtual bus id of SSP links are the hardware port ids proper. */</span><br><span>@@ -210,3 +257,10 @@</span><br><span> return nhlt_add_ssp_endpoints(nhlt, hwlink, max98357_descriptors,</span><br><span> ARRAY_SIZE(max98357_descriptors));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int nhlt_soc_add_rt5682(struct nhlt *nhlt, int hwlink)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Virtual bus id of SSP links are the hardware port ids proper. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return nhlt_add_ssp_endpoints(nhlt, hwlink, rt5682_descriptors,</span><br><span style="color: hsl(120, 100%, 40%);">+ ARRAY_SIZE(rt5682_descriptors));</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/26057">change 26057</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/26057"/><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: Ic26a0b881f77af64ba00fd714b08c0f17c0acb3d </div>
<div style="display:none"> Gerrit-Change-Number: 26057 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Naveen Manohar <naveen.m@intel.com> </div>