From db287aad2547d6bc4a710c8a511448b5ff5ebead Mon Sep 17 00:00:00 2001
From: Shelley Chen <shchen@chromium.org>
Date: Fri, 9 Jun 2017 12:56:08 -0700
Subject: google/fizz: Enable cr50 over i2c

BUG=b:62456589, b:35775024
BRANCH=None
TEST=Reboot and ensure verstage doesn't have any TPM errors
CQ-DEPEND=CL:530185

Change-Id: Icfde0f62bd058d960fcb0c6fc67f9d8f6b9462f5
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://review.coreboot.org/20133
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/fizz/mainboard.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mainboard/google/fizz/mainboard.c')

diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index d515d29c43..5346276d35 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -17,6 +17,7 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <ec/ec.h>
+#include <soc/pci_devs.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 static void mainboard_init(device_t dev)
@@ -26,8 +27,17 @@ static void mainboard_init(device_t dev)
 
 static void mainboard_enable(device_t dev)
 {
+	device_t tpm;
+
 	dev->ops->init = mainboard_init;
 	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+
+	/* Disable unused interface for TPM. */
+	if (!IS_ENABLED(CONFIG_FIZZ_USE_I2C_TPM)) {
+		tpm = PCH_DEV_I2C1;
+		if (tpm)
+			tpm->enabled = 0;
+	}
 }
 
 struct chip_operations mainboard_ops = {
-- 
cgit v1.2.3