[S] Change in coreboot[main]: mb/google/brox: Fix configuration for TPM

[Shelley Chen (Code Review)]

Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/79102?usp=email )

Change subject: mb/google/brox: Fix configuration for TPM
......................................................................

mb/google/brox: Fix configuration for TPM

On Brox, TPM is using i2c4 and GPP_E2, so modifying the Kconfig to
reflect this.  Also, fixing up the TPM entry in the device tree.
Making sure that the GPIO for GSC_PCH_INT_ODL is set correctly.

BUG=b:300690448
BRANCH=None
TEST=emerge-brox coreboot

Change-Id: I0ecaa6fcfc05c3c2e55f857d7a4e59fe46096bb5
Signed-off-by: Shelley Chen 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79102
Reviewed-by: Karthik Ramasubramanian 
Tested-by: build bot (Jenkins) 
Reviewed-by: Eric Lai 
Reviewed-by: Ivy Jian 
---
M src/mainboard/google/brox/Kconfig
M src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
2 files changed, 16 insertions(+), 18 deletions(-)

Approvals:
  Ivy Jian: Looks good to me, approved
  Karthik Ramasubramanian: Looks good to me, approved
  build bot (Jenkins): Verified
  Eric Lai: Looks good to me, approved

diff --git a/src/mainboard/google/brox/Kconfig b/src/mainboard/google/brox/Kconfig
index 08a0656..f6f33b6 100644
--- a/src/mainboard/google/brox/Kconfig
+++ b/src/mainboard/google/brox/Kconfig
@@ -76,7 +76,7 @@

config DRIVER_TPM_I2C_BUS
    hex
-	default 0x1 if BOARD_GOOGLE_BROX
+	default 0x4 if BOARD_GOOGLE_BROX

config DRIVER_TPM_I2C_ADDR
    hex
@@ -87,7 +87,7 @@

config TPM_TIS_ACPI_INTERRUPT
    int
-	default 13
+	default 66 # GPE0_DW2_02 (GPP_E2)

config OVERRIDE_DEVICETREE
    default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
diff --git a/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb b/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
index 2b73ad2..c8b4c5a 100644
--- a/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
+++ b/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
@@ -76,14 +76,12 @@
    #+-------------------+---------------------------+
    #| Field             |  Value                    |
    #+-------------------+---------------------------+
-	#| GSPI1             | Fingerprint MCU           |
-	#| I2C0              | Audio and WFC             |
-	#| I2C1              | cr50 TPM. Early init is   |
+	#| I2C0              | Trackpad                  |
+	#| I2C1              | Touchscreen               |
+	#| I2C2              | ISH Sensor                |
+	#| I2C4              | cr50 TPM. Early init is   |
    #|                   | required to set up a BAR  |
    #|                   | for TPM communication     |
-	#| I2C2              | SAR0                      |
-	#| I2C3              | Touchscreen               |
-	#| I2C5              | Trackpad                  |
    #+-------------------+---------------------------+
    register "common_soc_config" = "{
    	.i2c[0] = {
@@ -94,24 +92,18 @@
    	},
    	.i2c[1] = {
    		.speed = I2C_SPEED_FAST,
-			.rise_time_ns = 650,
+			.rise_time_ns = 600,
    		.fall_time_ns = 400,
    		.data_hold_time_ns = 50,
    	},
    	.i2c[2] = {
    		.speed = I2C_SPEED_FAST,
-			.rise_time_ns = 900,
-			.fall_time_ns = 400,
-			.data_hold_time_ns = 50,
-		},
-		.i2c[3] = {
-			.early_init = 1,
-			.speed = I2C_SPEED_FAST,
    		.rise_time_ns = 600,
    		.fall_time_ns = 400,
    		.data_hold_time_ns = 50,
    	},
-		.i2c[5] = {
+		.i2c[4] = {
+			.early_init = 1,
    		.speed = I2C_SPEED_FAST,
    		.rise_time_ns = 650,
    		.fall_time_ns = 400,
@@ -167,7 +159,13 @@
    			device generic 0 on end
    		end
    	end
-		device ref i2c3 on end
+		device ref i2c4 on
+			chip drivers/i2c/tpm
+				register "hid" = ""GOOG0005""
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E2_IRQ)"
+				device i2c 50 on end
+			end
+		end
    	device ref heci1 on end
    	device ref sata on end
    	device ref pcie_rp8 on