From c47eda0e6be36fe7b8c77ff5d41db8d240cf67fd Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Wed, 10 Apr 2019 17:19:28 +0800 Subject: 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 Change-Id: Ic028c5d7b687a069d7f0510897bea91dca58e91f Reviewed-on: https://review.coreboot.org/c/coreboot/+/32265 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- .../google/hatch/variants/hatch/overridetree.cb | 18 +++++++++++++++--- .../google/hatch/variants/hatch_whl/overridetree.cb | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb index 54923797be..22a0947b77 100644 --- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb @@ -68,8 +68,19 @@ chip soc/intel/cannonlake 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 @@ chip soc/intel/cannonlake 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 dad372fd4c..5bcb67e9c7 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 @@ chip soc/intel/cannonlake 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 @@ chip soc/intel/cannonlake 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"" -- cgit v1.2.3