summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/guybrush/variants/guybrush/Makefile.inc2
-rw-r--r--src/mainboard/google/guybrush/variants/guybrush/gpio.c26
3 files changed, 29 insertions, 1 deletions
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
index 4023b2908b..528ace1653 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
@@ -80,7 +80,7 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* EN_PP3300_TCHSCR */
PAD_GPO(GPIO_68, LOW),
/* EN_SPKR */
- PAD_GPO(GPIO_69, LOW),
+ PAD_GPO(GPIO_69, HIGH),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_70, HIGH),
/* GPIO_71 - GPIO_73: Not available */
diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
index 88e75bde52..ba8514c4c2 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
+ramstage-y += gpio.c
+
subdirs-y += ./memory
diff --git a/src/mainboard/google/guybrush/variants/guybrush/gpio.c b/src/mainboard/google/guybrush/variants/guybrush/gpio.c
new file mode 100644
index 0000000000..64afa60fae
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/guybrush/gpio.c
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <boardid.h>
+#include <gpio.h>
+#include <soc/gpio.h>
+
+/* This table is used by guybrush variant with board version < 2. */
+static const struct soc_amd_gpio bid1_gpio_table[] = {
+ /* EN_SPKR */
+ PAD_GPO(GPIO_69, LOW),
+};
+
+const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
+{
+ uint32_t board_version = board_id();
+ *size = 0;
+
+ if (board_version < 2) {
+ *size = ARRAY_SIZE(bid1_gpio_table);
+ return bid1_gpio_table;
+ }
+
+ return NULL;
+}