<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25695">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge/include/soc/gpio.h: Remove vendor code reference<br><br>With the exception of code that deals directly or indirectly with AGESA,<br>all other code should be independent of vendor code reference. Therefor,<br>remove vendor code reference from any GPIO code.<br><br>BUG=b:77999987<br>TEST=Build and boot grunt.<br><br>Change-Id: I9ba78767a269ad6b9b06fa11993d8a12350e4bad<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/mainboard/amd/gardenia/gpio.c<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>M src/soc/amd/stoneyridge/include/soc/gpio.h<br>3 files changed, 4 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/25695/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/amd/gardenia/gpio.c b/src/mainboard/amd/gardenia/gpio.c</span><br><span>index cb10e74..6672ea5 100644</span><br><span>--- a/src/mainboard/amd/gardenia/gpio.c</span><br><span>+++ b/src/mainboard/amd/gardenia/gpio.c</span><br><span>@@ -13,8 +13,6 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <amdblocks/agesawrapper.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <amdblocks/BiosCallOuts.h></span><br><span> #include <soc/southbridge.h></span><br><span> #include <stdlib.h></span><br><span> #include <soc/gpio.h></span><br><span>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>index bc35ff5..e827a72 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -20,7 +20,6 @@</span><br><span> #include <stddef.h></span><br><span> #include <soc/smi.h></span><br><span> #include <soc/southbridge.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <amdblocks/agesawrapper.h></span><br><span> </span><br><span> const struct sci_source *get_gpe_table(size_t *num);</span><br><span> uint8_t variant_memory_sku(void);</span><br><span>diff --git a/src/soc/amd/stoneyridge/include/soc/gpio.h b/src/soc/amd/stoneyridge/include/soc/gpio.h</span><br><span>index e1ae5dd..664c074 100644</span><br><span>--- a/src/soc/amd/stoneyridge/include/soc/gpio.h</span><br><span>+++ b/src/soc/amd/stoneyridge/include/soc/gpio.h</span><br><span>@@ -46,14 +46,6 @@</span><br><span> #define GPIO_INT_STATUS (1 << 28)</span><br><span> #define GPIO_WAKE_STATUS (1 << 29)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * The definitions below should be used to make GPIO arrays compact and</span><br><span style="color: hsl(0, 100%, 40%);">- * easy to understand.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#define INPUT 0</span><br><span style="color: hsl(0, 100%, 40%);">-#define OUTPUT_H (FCH_GPIO_OUTPUT_ENABLE | FCH_GPIO_OUTPUT_VALUE)</span><br><span style="color: hsl(0, 100%, 40%);">-#define OUTPUT_L FCH_GPIO_OUTPUT_ENABLE</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* GPIO_0 - GPIO_62 */</span><br><span> #define GPIO_BANK0_CONTROL(gpio) \</span><br><span> (AMD_SB_ACPI_MMIO_ADDR + 0x1500 + ((gpio) * 4))</span><br><span>@@ -333,11 +325,11 @@</span><br><span> #define GPIO_148_IOMUX_I2C1_SDA 0</span><br><span> #define GPIO_148_IOMUX_GPIOxx 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define GPIO_OUTPUT_OUT_HIGH (FCH_GPIO_OUTPUT_ENABLE | FCH_GPIO_OUTPUT_VALUE)</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPIO_OUTPUT_OUT_LOW FCH_GPIO_OUTPUT_ENABLE</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPIO_OUTPUT_OUT_HIGH (BIT(6) | BIT(7))</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPIO_OUTPUT_OUT_LOW BIT(7)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define GPIO_PULL_PULL_UP FCH_GPIO_PULL_UP_ENABLE</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPIO_PULL_PULL_DOWN FCH_GPIO_PULL_DOWN_ENABLE</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPIO_PULL_PULL_UP BIT(4)</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPIO_PULL_PULL_DOWN BIT(5)</span><br><span> #define GPIO_PULL_PULL_NONE 0</span><br><span> </span><br><span> /* Native function pad configuration */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25695">change 25695</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/25695"/><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: I9ba78767a269ad6b9b06fa11993d8a12350e4bad </div>
<div style="display:none"> Gerrit-Change-Number: 25695 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>