From 532f205a05868c46519af1be7ceb083872644e16 Mon Sep 17 00:00:00 2001 From: Tim Wawrzynczak Date: Tue, 23 Jul 2019 13:35:21 -0600 Subject: mb/google/hatch/helios: Update GPIO and device tree Based on updated schematics, change polarity of USI_INT, and add the reset and enable GPIOs to the touchscreen ACPI node. The stop GPIO can't be used with the current implementation of _ON, as the way it's wired will cause power sequencing to fail. BUG=b:137133194, b:138240502 BRANCH=none TEST=Compiles, don't have next board rev to test with Change-Id: I1dfb8e649418e4c5e9b897fb4bc11393adc21ea2 Signed-off-by: Tim Wawrzynczak Reviewed-on: https://review.coreboot.org/c/coreboot/+/34528 Tested-by: build bot (Jenkins) Reviewed-by: Paul Fagerburg --- src/mainboard/google/hatch/variants/helios/gpio.c | 4 +++- src/mainboard/google/hatch/variants/helios/overridetree.cb | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/mainboard/google/hatch/variants') diff --git a/src/mainboard/google/hatch/variants/helios/gpio.c b/src/mainboard/google/hatch/variants/helios/gpio.c index 12801de31a..ecb13f3a7a 100644 --- a/src/mainboard/google/hatch/variants/helios/gpio.c +++ b/src/mainboard/google/hatch/variants/helios/gpio.c @@ -51,6 +51,8 @@ static const struct pad_config gpio_table[] = { PAD_NC(GPP_D8, NONE), /* D10 : ISH_SPI_CLK ==> EN_PP3300_PP1800_FP */ PAD_CFG_GPO(GPP_D10, 0, DEEP), + /* D16 : USI_INT_L */ + PAD_CFG_GPI_APIC(GPP_D16, NONE, PLTRST, LEVEL, INVERT), /* D21 : SPI1_IO2 ==> NC */ PAD_NC(GPP_D21, NONE), /* F0 : GPP_F0 ==> NC */ @@ -90,7 +92,7 @@ static const struct pad_config gpio_table[] = { /* H13 : M2_SKT2_CFG1 ==> SPKR_RST_L */ PAD_CFG_GPO(GPP_H13, 1, DEEP), /* H14 : M2_SKT2_CFG2 ==> TOUCHSCREEN_STOP_L */ - PAD_CFG_GPO(GPP_H14, 0, PLTRST), + PAD_CFG_GPO(GPP_H14, 1, PLTRST), /* H19 : TIMESYNC[0] ==> MEM_STRAP_0 */ PAD_CFG_GPI(GPP_H19, NONE, PLTRST), /* H22 : MEM_STRAP_1 */ diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb index 41c15c895c..cedf046e5f 100644 --- a/src/mainboard/google/hatch/variants/helios/overridetree.cb +++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb @@ -83,12 +83,17 @@ chip soc/intel/cannonlake chip drivers/i2c/hid register "generic.hid" = ""GDIX0000"" register "generic.desc" = ""Goodix Touchscreen"" - register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_D16_IRQ)" + register "generic.irq" = + "ACPI_IRQ_EDGE_LOW(GPP_D16_IRQ)" register "generic.probed" = "1" register "generic.reset_gpio" = - "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)" + "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)" register "generic.reset_delay_ms" = "10" register "generic.reset_off_delay_ms" = "1" + register "generic.enable_gpio" = + "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D9)" + register "generic.enable_delay_ms" = "10" + register "generic.enable_off_delay_ms" = "1" register "generic.has_power_resource" = "1" register "hid_desc_reg_offset" = "0x01" device i2c 5d on end -- cgit v1.2.3