<p>Sathyanarayana Nujella has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26143">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: mb/google/poppy/variants/nocturne: update Audio configuration<br><br>Nocturne board has only Max98373 speaker amp.<br>Updated both NHLT and DT entries to include only Max98373<br>and not include DA7219.<br><br>BUG=b:79362472<br>TEST=None<br><br>Change-Id: I0e9b3a564c22de6e84e96e5e937a3aca4ae73d75<br>Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com><br>---<br>M src/mainboard/google/poppy/Kconfig<br>M src/mainboard/google/poppy/variants/nocturne/devicetree.cb<br>M src/mainboard/google/poppy/variants/nocturne/gpio.c<br>M src/mainboard/google/poppy/variants/nocturne/nhlt.c<br>4 files changed, 6 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/26143/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 8cd636d..2aa876b 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -81,8 +81,7 @@</span><br><span> </span><br><span> config INCLUDE_NHLT_BLOBS_NOCTURNE</span><br><span> bool "Include blobs for nocturne audio."</span><br><span style="color: hsl(0, 100%, 40%);">- select NHLT_DA7219</span><br><span style="color: hsl(0, 100%, 40%);">- select NHLT_DMIC_2CH</span><br><span style="color: hsl(120, 100%, 40%);">+ select NHLT_DMIC_4CH</span><br><span> select NHLT_MAX98373</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb</span><br><span>index b69273a..85392ca 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb</span><br><span>+++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb</span><br><span>@@ -274,23 +274,6 @@</span><br><span> register "name" = ""MAXL""</span><br><span> device i2c 32 on end</span><br><span> end</span><br><span style="color: hsl(0, 100%, 40%);">- chip drivers/i2c/da7219</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "btn_cfg" = "50"</span><br><span style="color: hsl(0, 100%, 40%);">- register "mic_det_thr" = "500"</span><br><span style="color: hsl(0, 100%, 40%);">- register "jack_ins_deb" = "20"</span><br><span style="color: hsl(0, 100%, 40%);">- register "jack_det_rate" = ""32ms_64ms""</span><br><span style="color: hsl(0, 100%, 40%);">- register "jack_rem_deb" = "1"</span><br><span style="color: hsl(0, 100%, 40%);">- register "a_d_btn_thr" = "0xa"</span><br><span style="color: hsl(0, 100%, 40%);">- register "d_b_btn_thr" = "0x16"</span><br><span style="color: hsl(0, 100%, 40%);">- register "b_c_btn_thr" = "0x21"</span><br><span style="color: hsl(0, 100%, 40%);">- register "c_mic_btn_thr" = "0x3e"</span><br><span style="color: hsl(0, 100%, 40%);">- register "btn_avg" = "4"</span><br><span style="color: hsl(0, 100%, 40%);">- register "adc_1bit_rpt" = "1"</span><br><span style="color: hsl(0, 100%, 40%);">- register "micbias_lvl" = "2600"</span><br><span style="color: hsl(0, 100%, 40%);">- register "mic_amp_in_sel" = ""diff""</span><br><span style="color: hsl(0, 100%, 40%);">- device i2c 1a on end</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span> end # I2C #4 - Audio</span><br><span> device pci 1c.0 on</span><br><span> chip drivers/intel/wifi</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nocturne/gpio.c b/src/mainboard/google/poppy/variants/nocturne/gpio.c</span><br><span>index f69409f..b3df9ef 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nocturne/gpio.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nocturne/gpio.c</span><br><span>@@ -260,7 +260,7 @@</span><br><span> /* F0 : I2S2_SCLK ==> BOOT_BEEP_CLK */</span><br><span> PAD_CFG_NF_1V8(GPP_F0, NONE, DEEP, NF1),</span><br><span> /* F1 : I2S2_SFRM ==> BOOT_BEEP_BUFFER_OE */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_1V8(GPP_F1, NONE, DEEP, NF1),</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO(GPP_F1, 1, DEEP),</span><br><span> /* F2 : I2S2_TXD ==> BOOT_BEEP_SFRM */</span><br><span> PAD_CFG_NC(GPP_F2),</span><br><span> /* F3 : I2S2_RXD ==> NC */</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nocturne/nhlt.c b/src/mainboard/google/poppy/variants/nocturne/nhlt.c</span><br><span>index 6ff720e..04a4482 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nocturne/nhlt.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nocturne/nhlt.c</span><br><span>@@ -20,13 +20,9 @@</span><br><span> </span><br><span> void variant_nhlt_init(struct nhlt *nhlt)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* 2 Channel DMIC array. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (nhlt_soc_add_dmic_array(nhlt, 2))</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "Couldn't add 2CH DMIC array.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Dialog DA7219 Headset codec. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP1))</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "Couldn't add Dialog DA7219 codec.\n");</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> </span><br><span> /* MAXIM Smart Amps for left and right speakers. */</span><br><span> if (nhlt_soc_add_max98373(nhlt, AUDIO_LINK_SSP0))</span><br><span>@@ -37,6 +33,6 @@</span><br><span> uint32_t *oem_revision)</span><br><span> {</span><br><span> *oem_id = "GOOGLE";</span><br><span style="color: hsl(0, 100%, 40%);">- *oem_table_id = "NOCTURNEMAX";</span><br><span style="color: hsl(120, 100%, 40%);">+ *oem_table_id = "NOCTURNE";</span><br><span> *oem_revision = 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26143">change 26143</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/26143"/><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: I0e9b3a564c22de6e84e96e5e937a3aca4ae73d75 </div>
<div style="display:none"> Gerrit-Change-Number: 26143 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> </div>