<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27641">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/octopus: Use newly added gpio_configure_pads_with_override<br><br>This change updates mainboard_init to call<br>gpio_configure_pads_with_override instead of gpio_configure_pads to<br>allow variants to provide overrides for the GPIO config table provided<br>by the baseboard.<br><br>BUG=b:111743717<br>TEST=Verified on phaser that GPIO config with and without this change<br>is the same.<br><br>Change-Id: I494a950100e5ec82504d652ff6e8a75746456d1f<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/octopus/mainboard.c<br>M src/mainboard/google/octopus/variants/baseboard/gpio.c<br>M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/octopus/variants/bip/gpio.c<br>4 files changed, 18 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/41/27641/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c</span><br><span>index eda44ba..4876d10 100644</span><br><span>--- a/src/mainboard/google/octopus/mainboard.c</span><br><span>+++ b/src/mainboard/google/octopus/mainboard.c</span><br><span>@@ -32,14 +32,18 @@</span><br><span> static void mainboard_init(void *chip_info)</span><br><span> {</span><br><span> int boardid;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct pad_config *pads;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t num;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct pad_config *base_pads;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct pad_config *override_pads;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t base_num, override_num;</span><br><span> </span><br><span> boardid = board_id();</span><br><span> printk(BIOS_INFO, "Board ID: %d\n", boardid);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pads = variant_gpio_table(&num);</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_configure_pads(pads, num);</span><br><span style="color: hsl(120, 100%, 40%);">+ base_pads = variant_base_gpio_table(&base_num);</span><br><span style="color: hsl(120, 100%, 40%);">+ override_pads = variant_override_gpio_table(&override_num);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_configure_pads_with_override(base_pads, base_num,</span><br><span style="color: hsl(120, 100%, 40%);">+ override_pads, override_num);</span><br><span> </span><br><span> mainboard_ec_init();</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>index 7b1075f..3dee892 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>@@ -281,12 +281,18 @@</span><br><span> PAD_NC(GPIO_210, DN_20K),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *__weak variant_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *__weak variant_base_gpio_table(size_t *num)</span><br><span> {</span><br><span> *num = ARRAY_SIZE(gpio_table);</span><br><span> return gpio_table;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *__weak variant_override_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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* GPIOs needed prior to ramstage. */</span><br><span> static const struct pad_config early_gpio_table[] = {</span><br><span> PAD_CFG_GPI(GPIO_190, NONE, DEEP), /* PCH_WP_OD */</span><br><span>diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h</span><br><span>index 4c3fbbe..666e562 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -26,7 +26,8 @@</span><br><span> </span><br><span> /* The next set of functions return the gpio table and fill in the number of</span><br><span> * entries for each table. */</span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *variant_gpio_table(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_base_gpio_table(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_override_gpio_table(size_t *num);</span><br><span> const struct pad_config *variant_early_gpio_table(size_t *num);</span><br><span> const struct pad_config *variant_sleep_gpio_table(size_t *num, int slp_typ);</span><br><span> </span><br><span>diff --git a/src/mainboard/google/octopus/variants/bip/gpio.c b/src/mainboard/google/octopus/variants/bip/gpio.c</span><br><span>index 5f83ee4..18cb6d9 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/bip/gpio.c</span><br><span>+++ b/src/mainboard/google/octopus/variants/bip/gpio.c</span><br><span>@@ -259,7 +259,7 @@</span><br><span> PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_210, 0, DEEP, NONE, HIZCRx0, DISPUPD),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *variant_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_base_gpio_table(size_t *num)</span><br><span> {</span><br><span> *num = ARRAY_SIZE(gpio_table);</span><br><span> return gpio_table;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27641">change 27641</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/27641"/><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: I494a950100e5ec82504d652ff6e8a75746456d1f </div>
<div style="display:none"> Gerrit-Change-Number: 27641 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>