[coreboot-gerrit] Change in coreboot[master]: mb/google/herobrine: Update GPIOs to Proto1

[Shelley Chen (Code Review)]

Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60285 )

Change subject: mb/google/herobrine: Update GPIOs to Proto1
......................................................................

mb/google/herobrine: Update GPIOs to Proto1

Update all the BOARD_GOOGLE_HEROBRINE GPIOs to those of the Proto1
board.

BUG=b:211644878
BRANCH=NONE
TEST=emerge-herobrine coreboot

Change-Id: Iebf1d00a0ccbbc97a5bcb821a0ee1b6289e0a2ce
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/herobrine/board.h
M src/mainboard/google/herobrine/mainboard.c
2 files changed, 11 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/60285/1

diff --git a/src/mainboard/google/herobrine/board.h b/src/mainboard/google/herobrine/board.h
index 4278c11..e13f84c 100644
--- a/src/mainboard/google/herobrine/board.h
+++ b/src/mainboard/google/herobrine/board.h
@@ -22,9 +22,9 @@

/* Fingerprint-specific GPIOs. Only for fingerprint-enabled devices. */
 #if CONFIG(HEROBRINE_HAS_FINGERPRINT)
-#define GPIO_FPMCU_BOOT0	GPIO(77)
+#define GPIO_FPMCU_BOOT0	(CONFIG(BOARD_GOOGLE_HEROBRINE_PROTO0) ? GPIO(77) : GPIO(68))
 #define GPIO_FP_RST_L		GPIO(78)
-#define GPIO_EN_FP_RAILS	GPIO(42)
+#define GPIO_EN_FP_RAILS	(CONFIG(BOARD_GOOGLE_HEROBRINE_PROTO0) ? GPIO(42) : GPIO(77))
 #else
 #define GPIO_FPMCU_BOOT0	dead_code_t(gpio_t)
 #define GPIO_FP_RST_L		dead_code_t(gpio_t)
diff --git a/src/mainboard/google/herobrine/mainboard.c b/src/mainboard/google/herobrine/mainboard.c
index f2432d9..aea88c9 100644
--- a/src/mainboard/google/herobrine/mainboard.c
+++ b/src/mainboard/google/herobrine/mainboard.c
@@ -75,6 +75,15 @@
    	qupv3_se_fw_load_and_init(QUPV3_1_SE4, SE_PROTOCOL_SPI, MIXED);
    	/* Fingerprint SPI */
    	qupv3_se_fw_load_and_init(QUPV3_1_SE6, SE_PROTOCOL_SPI, MIXED);
+	} else { /* BOARD_GOOGLE_HEROBRINE */
+		/* Trackpad I2C */
+		qupv3_se_fw_load_and_init(QUPV3_0_SE0, SE_PROTOCOL_I2C, MIXED);
+		/* SAR sensor I2C */
+		qupv3_se_fw_load_and_init(QUPV3_0_SE1, SE_PROTOCOL_I2C, MIXED);
+		/* Audio I2C */
+		qupv3_se_fw_load_and_init(QUPV3_0_SE2, SE_PROTOCOL_I2C, MIXED);
+		/* Fingerprint SPI */
+		qupv3_se_fw_load_and_init(QUPV3_1_SE1, SE_PROTOCOL_SPI, MIXED);
    }

/* Take FPMCU out of reset. Power was already applied