diff --git a/src/mainboard/google/bluey/Kconfig b/src/mainboard/google/bluey/Kconfig
index a22cae6bab..0746970bc5 100644
--- a/src/mainboard/google/bluey/Kconfig
+++ b/src/mainboard/google/bluey/Kconfig
@@ -49,13 +49,13 @@ config MAINBOARD_PART_NUMBER
 config DRIVER_TPM_I2C_BUS
 	depends on I2C_TPM
 	hex
-	default 0x00 # TODO
+	default 0x10
 
 config DRIVER_TPM_I2C_ADDR
 	default 0x50
 
 config EC_GOOGLE_CHROMEEC_SPI_BUS
 	hex
-	default 0x0 # TODO
+	default 0xb
 
 endif # BOARD_GOOGLE_BLUEY_COMMON
diff --git a/src/mainboard/google/bluey/board.h b/src/mainboard/google/bluey/board.h
index e6de22ef48..f7c4f23d91 100644
--- a/src/mainboard/google/bluey/board.h
+++ b/src/mainboard/google/bluey/board.h
@@ -6,8 +6,8 @@
 #include <assert.h>
 #include <gpio.h>
 
-#define GPIO_AP_EC_INT		GPIO(0)
-#define GPIO_GSC_AP_INT		GPIO(0)
+#define GPIO_AP_EC_INT		GPIO(67)
+#define GPIO_GSC_AP_INT		GPIO(34)
 
 void setup_chromeos_gpios(void);