Shelley Chen has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32265 )
Change subject: mb/google/hatch: Restore Goodix Touch Screen ......................................................................
mb/google/hatch: Restore Goodix Touch Screen
Restore Goodix devicetree config because of the missing Goodix config when moving from baseboard devicetree to board level overridetree. And move PENH from I2C#2 to I2C#1.
BUG=b:124460799 BRANCH=None TEST=local build and tested with Goodix touch screen
Signed-off-by: Eric Lai ericr_lai@compal.corp-partner.google.com Change-Id: Ic028c5d7b687a069d7f0510897bea91dca58e91f Reviewed-on: https://review.coreboot.org/c/coreboot/+/32265 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/hatch/variants/hatch/overridetree.cb M src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb 2 files changed, 30 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb index 5492379..22a0947 100644 --- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb @@ -68,8 +68,19 @@ register "stop_off_delay_ms" = "5" device i2c 49 on end end - end # I2C #1 - device pci 15.2 on + 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.probed" = "1" + register "generic.reset_gpio" = + "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)" + register "generic.reset_delay_ms" = "30" + register "generic.reset_off_delay_ms" = "3" + register "generic.has_power_resource" = "1" + register "hid_desc_reg_offset" = "0x01" + device i2c 5d on end + end chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_HIGH(GPP_A8)" @@ -79,7 +90,8 @@ register "key.label" = ""pen_eject"" device generic 0 on end end - end # I2C #2 + end # I2C #1 + device pci 15.2 off end # I2C #2 device pci 15.3 on chip drivers/i2c/sx9310 register "desc" = ""SAR Proximity Sensor"" diff --git a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb index dad372f..5bcb67e 100644 --- a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb @@ -53,8 +53,19 @@ register "stop_off_delay_ms" = "5" device i2c 49 on end end - end # I2C #1 - device pci 15.2 on + 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.probed" = "1" + register "generic.reset_gpio" = + "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)" + register "generic.reset_delay_ms" = "30" + register "generic.reset_off_delay_ms" = "3" + register "generic.has_power_resource" = "1" + register "hid_desc_reg_offset" = "0x01" + device i2c 5d on end + end chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_HIGH(GPP_A8)" @@ -64,7 +75,8 @@ register "key.label" = ""pen_eject"" device generic 0 on end end - end # I2C #2 + end # I2C #1 + device pci 15.2 off end # I2C #2 device pci 15.3 on chip drivers/i2c/sx9310 register "desc" = ""SAR Proximity Sensor""