Change in coreboot[master]: mb/google/brya/anahera: Swap TPM I2C with touchscreen I2C

[Chen Wisley (Code Review)]

Attention is currently required from: Wisley Chen.
Hello Wisley Chen,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/60432

to review the following change.

Change subject: mb/google/brya/anahera: Swap TPM I2C with touchscreen I2C
......................................................................

mb/google/brya/anahera: Swap TPM I2C with touchscreen I2C

According to the latest schematic, exchange I2C port for TPM/touchscreen.
TPM: I2C3 -> I2C1
Touchscreen: I2C1 -> I2C3

BUG=none
TEST=FW_NAME=anahera emerge-brya coreboot

Change-Id: I1bb1857b4c5b06ca4ad660bf73e0c4df9c376a58
Signed-off-by: Wisley Chen 
---
M src/mainboard/google/brya/Kconfig
M src/mainboard/google/brya/variants/anahera/gpio.c
M src/mainboard/google/brya/variants/anahera/overridetree.cb
3 files changed, 21 insertions(+), 25 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/60432/1

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 13628dd..e3abcdd 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -90,7 +90,7 @@
    default 0x3 if BOARD_GOOGLE_TAEKO
    default 0x3 if BOARD_GOOGLE_TAEKO4ES
    default 0x1 if BOARD_GOOGLE_FELWINTER
-	default 0x3 if BOARD_GOOGLE_ANAHERA
+	default 0x1 if BOARD_GOOGLE_ANAHERA
    default 0x3 if BOARD_GOOGLE_ANAHERA4ES
    default 0x3 if BOARD_GOOGLE_VELL
    default 0x3 if BOARD_GOOGLE_TANIKS
diff --git a/src/mainboard/google/brya/variants/anahera/gpio.c b/src/mainboard/google/brya/variants/anahera/gpio.c
index 4ab457b..e4f47cd 100644
--- a/src/mainboard/google/brya/variants/anahera/gpio.c
+++ b/src/mainboard/google/brya/variants/anahera/gpio.c
@@ -97,10 +97,10 @@
 static const struct pad_config early_gpio_table[] = {
    /* A13 : PMC_I2C_SCL ==> GSC_PCH_INT_ODL */
    PAD_CFG_GPI_APIC(GPP_A13, NONE, PLTRST, LEVEL, INVERT),
-	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
-	PAD_CFG_NF(GPP_B7, NONE, DEEP, NF2),
-	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
-	PAD_CFG_NF(GPP_B8, NONE, DEEP, NF2),
+	/* H6  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF(GPP_H6, NONE, DEEP, NF1),
+	/* H7  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF(GPP_H7, NONE, DEEP, NF1),
    /*
     * D1  : ISH_GP1 ==> FP_RST_ODL
     * FP_RST_ODL comes out of reset as hi-z and does not have an external pull-down.
diff --git a/src/mainboard/google/brya/variants/anahera/overridetree.cb b/src/mainboard/google/brya/variants/anahera/overridetree.cb
index 1038798..c3711dc 100644
--- a/src/mainboard/google/brya/variants/anahera/overridetree.cb
+++ b/src/mainboard/google/brya/variants/anahera/overridetree.cb
@@ -40,29 +40,25 @@
    #+-------------------+---------------------------+
    #| GSPI1             | Fingerprint MCU           |
    #| I2C0              | Audio                     |
-	#| I2C1              | Touchscreen               |
-	#| I2C2              |                           |
-	#| I2C3              | cr50 TPM. Early init is   |
+	#| I2C1              | cr50 TPM. Early init is   |
    #|                   | required to set up a BAR  |
    #|                   | for TPM communication     |
+	#| I2C3              | Touchscreen               |
    #| I2C5              | Trackpad                  |
    #+-------------------+---------------------------+
    register "common_soc_config" = "{
-		.i2c[0] = {
-			.speed = I2C_SPEED_FAST,
-		},
    	.i2c[1] = {
-			.speed = I2C_SPEED_FAST,
-		},
-		.i2c[2] = {
-			.speed = I2C_SPEED_FAST,
-		},
-		.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[3] = {
    		.speed = I2C_SPEED_FAST,
+			.rise_time_ns = 650,
+			.fall_time_ns = 400,
+			.data_hold_time_ns = 50,
    	},
    }"
    register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)"     # Type-A MLB Port
@@ -200,6 +196,13 @@
    		end
    	end #I2C0
    	device ref i2c1 on
+			chip drivers/i2c/tpm
+				register "hid" = ""GOOG0005""
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A13_IRQ)"
+				device i2c 50 on end
+			end
+		end
+		device ref i2c3 on
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0001""
    			register "desc" = ""ELAN Touchscreen""
@@ -236,13 +239,6 @@
    			device i2c 40 on end
    		end
    	end
-		device ref i2c3 on
-			chip drivers/i2c/tpm
-				register "hid" = ""GOOG0005""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A13_IRQ)"
-				device i2c 50 on end
-			end
-		end
    	device ref i2c5 on
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""