Change in coreboot[master]: mb/google/guybrush/var/nipperkin: Update SPKR, SD_AUX_RESET_L GPIO co...

[Kevin Chiu (Code Review)]

Kevin Chiu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59051 )

Change subject: mb/google/guybrush/var/nipperkin: Update SPKR, SD_AUX_RESET_L GPIO configuration
......................................................................

mb/google/guybrush/var/nipperkin: Update SPKR, SD_AUX_RESET_L GPIO configuration

For Nipperkin Board Version 2, update SPKR/SD_AUX_RESET_L GPIO to match H/W
schematic:
SPKR: GPIO70
SD_AUX_RESET_L: GPIO69

BUG=b:202992077
BRANCH=guybrush
TEST=emerge-guybrush coreboot chromeos-bootimage

Change-Id: I3d82292b116f53d85d9518364ffd2169bd915a7e
Signed-off-by: Kevin Chiu 
---
M src/mainboard/google/guybrush/variants/nipperkin/gpio.c
M src/mainboard/google/guybrush/variants/nipperkin/variant.c
2 files changed, 7 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/59051/1

diff --git a/src/mainboard/google/guybrush/variants/nipperkin/gpio.c b/src/mainboard/google/guybrush/variants/nipperkin/gpio.c
index 6a12ad3..2d803b1 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/gpio.c
+++ b/src/mainboard/google/guybrush/variants/nipperkin/gpio.c
@@ -34,8 +34,10 @@
    PAD_NC(GPIO_17),
    /* LCD_PRIVACY_PCH */
    PAD_GPO(GPIO_18, HIGH),
-	/* Unused */
-	PAD_NC(GPIO_69),
+	/* SD_AUX_RESET_L */
+	PAD_GPO(GPIO_69, HIGH),
+	/* EN_SPKR */
+	PAD_GPO(GPIO_70, HIGH),
 };

static const struct soc_amd_gpio override_early_gpio_table[] = {
@@ -57,7 +59,8 @@
 /* This table is used by nipperkin variant with board version >= 2. */
 static const struct soc_amd_gpio bid2_override_pcie_gpio_table[] = {
    PAD_NC(GPIO_18),
-	PAD_NC(GPIO_69),
+	/* SD_AUX_RESET_L */
+	PAD_GPO(GPIO_69, HIGH),
 };

/* This table is used by nipperkin variant with board version < 2. */
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/variant.c b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
index 917857c..e6a6a92 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/variant.c
+++ b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
@@ -15,5 +15,5 @@
 {
    uint32_t board_ver = board_id();

-	return (board_ver < 2) ? GPIO_69 : GPIO_5;
+	return (board_ver <= 2) ? GPIO_69 : GPIO_5;
 }