<p>Amanda Hwang has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25148">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy : Config GPIO for DMIC by different sku id<br><br>BUG=b:74177699<br>BRANCH=poppy<br>TEST=Verify audio recorder funtion by different SKU ID<br><br>Change-Id: Ic6570703f6ab4a1b03cbba8370fc0f597ab6bcf2<br>Signed-off-by: amanda_hwang <amanda_hwang@compal.corp-partner.google.com><br>---<br>M src/mainboard/google/poppy/ramstage.c<br>M src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/poppy/variants/nami/mainboard.c<br>3 files changed, 37 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/48/25148/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/ramstage.c b/src/mainboard/google/poppy/ramstage.c</span><br><span>index 5ef2451..faf375c 100644</span><br><span>--- a/src/mainboard/google/poppy/ramstage.c</span><br><span>+++ b/src/mainboard/google/poppy/ramstage.c</span><br><span>@@ -25,9 +25,19 @@</span><br><span> variant_devtree_update();</span><br><span> pads = variant_gpio_table(&num);</span><br><span> gpio_configure_pads(pads, num);</span><br><span style="color: hsl(120, 100%, 40%);">+ pads = variant_sku_gpio_table(&num);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_configure_pads(pads, num);</span><br><span> }</span><br><span> </span><br><span> void __attribute__((weak)) variant_devtree_update(void)</span><br><span> {</span><br><span> /* Override dev tree settings per board */</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* override specific gpio by sku id */</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config __attribute__((weak))</span><br><span style="color: hsl(120, 100%, 40%);">+*variant_sku_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>index e051c73..9a5bf26 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -28,6 +28,7 @@</span><br><span> const struct pad_config *variant_early_gpio_table(size_t *num);</span><br><span> </span><br><span> const struct cros_gpio *variant_cros_gpios(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_sku_gpio_table(size_t *num);</span><br><span> </span><br><span> enum memory_type {</span><br><span> MEMORY_LPDDR3,</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>index e2bc895..4a1b7bc 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>@@ -40,6 +40,11 @@</span><br><span> return sku_id;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct pad_config vayne_gpio_tables[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Disable DMIC on rear camera */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NC(GPP_D17),/* SOC_DMIC_CLK1 */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void variant_devtree_update(void)</span><br><span> {</span><br><span> /* Override dev tree settings per board */</span><br><span>@@ -55,6 +60,27 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_sku_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t sku_id = board_sku_id();</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct pad_config *board_gpio_tables;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (sku_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_1_VAYNE:</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = ARRAY_SIZE(vayne_gpio_tables);</span><br><span style="color: hsl(120, 100%, 40%);">+ board_gpio_tables = vayne_gpio_tables;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_2_VAYNE:</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = ARRAY_SIZE(vayne_gpio_tables);</span><br><span style="color: hsl(120, 100%, 40%);">+ board_gpio_tables = vayne_gpio_tables;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ board_gpio_tables = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return board_gpio_tables;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const char *smbios_mainboard_sku(void)</span><br><span> {</span><br><span> static char sku_str[9]; /* sku{0..65535} (basically up to FFFF) */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25148">change 25148</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/25148"/><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: Ic6570703f6ab4a1b03cbba8370fc0f597ab6bcf2 </div>
<div style="display:none"> Gerrit-Change-Number: 25148 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Amanda Hwang <amanda_hwang@compal.corp-partner.google.com> </div>