[M] Change in coreboot[main]: mb/google/var/trulo: Remove touchscreen definitions

[Kapil Porwal (Code Review)]

Kapil Porwal has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85893?usp=email )

Change subject: mb/google/var/trulo: Remove touchscreen definitions
......................................................................

mb/google/var/trulo: Remove touchscreen definitions

Remove touchscreen definitions for Trulo since it doesn't have any.
Additionally, disable unused I2C controller 5.

BUG=none
TEST=Build trulo firmware image

Change-Id: If9d00ebf6165449d96f9337f313ee83262507ab4
Signed-off-by: Kapil Porwal 
---
M src/mainboard/google/brya/variants/trulo/gpio.c
M src/mainboard/google/brya/variants/trulo/overridetree.cb
2 files changed, 9 insertions(+), 43 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/85893/1

diff --git a/src/mainboard/google/brya/variants/trulo/gpio.c b/src/mainboard/google/brya/variants/trulo/gpio.c
index 8f0ad94..c813154 100644
--- a/src/mainboard/google/brya/variants/trulo/gpio.c
+++ b/src/mainboard/google/brya/variants/trulo/gpio.c
@@ -44,8 +44,8 @@
    PAD_NC(GPP_A19, NONE),
    /* A20 : NC */
    PAD_NC(GPP_A20, NONE),
-	/* A21 : DDPC_CTRLCLK ==> TCHSCR_REPORT_EN */
-	PAD_CFG_GPO(GPP_A21, 0, DEEP),
+	/* A21 : NC */
+	PAD_NC(GPP_A21, NONE),
    /* A22 : GPP_A22 ==> TPM_PIRQ# */
    PAD_CFG_GPI(GPP_A22, NONE, DEEP),
    /* A23 : GPP_A23 ==> NC */
@@ -147,10 +147,10 @@
    PAD_CFG_NF(GPP_D13, NONE, DEEP, NF1),
    /* D14 : UART0_ISH_TX_DBG_RX */
    PAD_CFG_NF(GPP_D14, NONE, DEEP, NF1),
-	/* D15  : GPP_D15 ==> SOC_TS_I2C_RST# */
-	PAD_CFG_GPO_LOCK(GPP_D15, 1, LOCK_CONFIG),
-	/* D16 : ISH_UART0_CTS# ==> SOC_TS_I2C_INT# */
-	PAD_CFG_GPI_LOCK(GPP_D16, NONE, LOCK_CONFIG),
+	/* D15  : NC */
+	PAD_NC(GPP_D15, NONE),
+	/* D16  : NC */
+	PAD_NC(GPP_D16, NONE),
    /* D17 : NC */
    PAD_NC_LOCK(GPP_D17, NONE, LOCK_CONFIG),
    /* D18 : NC */
@@ -192,8 +192,8 @@
    PAD_NC(GPP_E15, NONE),
    /* E16 : NC */
    PAD_NC(GPP_E16, NONE),
-	/* E17  : GPP_E17 ==> SOC_TS_PWR_EN */
-	PAD_CFG_GPO_LOCK(GPP_E17, 1, LOCK_CONFIG),
+	/* E17  : NC */
+	PAD_NC(GPP_E17, NONE),
    /* E18 : NC */
    PAD_NC(GPP_E18, NONE),
    /* E19 : DDP1_CTRLDATA ==> GPP_E19_STRAP */
@@ -432,11 +432,6 @@

/* Fill romstage gpio configuration */
 static const struct pad_config romstage_gpio_table[] = {
-	/* Enable touchscreen, hold in reset */
-	/* E17  : GPP_E17 ==> SOC_TS_PWR_EN */
-	PAD_CFG_GPO(GPP_E17, 1, DEEP),
-	/* D15  : GPP_D15 ==> SOC_TS_I2C_RST# */
-	PAD_CFG_GPO(GPP_D15, 0, DEEP),
 };

const struct pad_config *variant_gpio_table(size_t *num)
diff --git a/src/mainboard/google/brya/variants/trulo/overridetree.cb b/src/mainboard/google/brya/variants/trulo/overridetree.cb
index d135db0..5374666 100644
--- a/src/mainboard/google/brya/variants/trulo/overridetree.cb
+++ b/src/mainboard/google/brya/variants/trulo/overridetree.cb
@@ -122,7 +122,7 @@
    	[PchSerialIoIndexI2C2] = PchSerialIoDisabled,
    	[PchSerialIoIndexI2C3] = PchSerialIoDisabled,
    	[PchSerialIoIndexI2C4] = PchSerialIoDisabled,
-		[PchSerialIoIndexI2C5] = PchSerialIoPci,
+		[PchSerialIoIndexI2C5] = PchSerialIoDisabled,
    }"

register "serial_io_gspi_mode" = "{
@@ -148,7 +148,6 @@
    #|                   | required to set up a BAR  |
    #|                   | for TPM communication     |
    #| I2C1              | Trackpad                  |
-	#| I2C5              | Touchscreen               |
    #+-------------------+---------------------------+
    register "common_soc_config" = "{
    	.i2c[0] = {
@@ -170,15 +169,6 @@
    			.sda_hold = 7,
    		}
    	},
-		.i2c[5] = {
-			.speed = I2C_SPEED_FAST,
-			.speed_config[0] = {
-				.speed = I2C_SPEED_FAST,
-				.scl_lcnt = 158,
-				.scl_hcnt = 79,
-				.sda_hold = 7,
-			}
-		},
    }"

device domain 0 on
@@ -470,25 +460,6 @@
    			device i2c 15 on end
    		end
    	end #I2C1
-		device ref i2c5 on
-			chip drivers/i2c/hid
-				register "generic.hid" = ""ELAN9004""
-				register "generic.desc" = ""ELAN Touchscreen""
-				register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D16_IRQ)"
-				register "generic.detect" = "1"
-				register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)"
-				register "generic.reset_delay_ms" = "20"
-				register "generic.reset_off_delay_ms" = "2"
-				register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E17)"
-				register "generic.enable_delay_ms" = "1"
-				register "generic.stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A21)"
-				register "generic.stop_delay_ms" = "150"
-				register "generic.stop_off_delay_ms" = "2"
-				register "generic.has_power_resource" = "1"
-				register "hid_desc_reg_offset" = "0x01"
-				device i2c 10 on end
-			end
-		end #I2C5
    	device ref heci1 on end
    	device ref emmc on
    		probe STORAGE STORAGE_UNKNOWN