From daeaa772a2fa9fe7bab666de396b9dcead4510d4 Mon Sep 17 00:00:00 2001 From: Chris Zhou Date: Thu, 24 Jan 2019 16:09:42 +0800 Subject: mb/google/sarien: Using HID over I2C to enable Melf TouchScreen Current Melfas touchscreen driver cannot unregister ifself when connecting without Melfas touchscreen or connecting with other devices. And Melfas touchscreen FW can use I2C and HID over I2C driver, so switch to using HID over I2C driver. BUG=b:122710830 BRANCH=master TEST=Verify touchscreen on sarien works with this change. Signed-off-by: Chris Zhou Change-Id: If04a2904a0f72a6c8363ab2c9865926c71cb5186 Reviewed-on: https://review.coreboot.org/c/31062 Tested-by: build bot (Jenkins) Reviewed-by: Lijian Zhao --- .../google/sarien/variants/sarien/devicetree.cb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/sarien/variants/sarien/devicetree.cb b/src/mainboard/google/sarien/variants/sarien/devicetree.cb index 76e5db77f7..0bf7e984a6 100644 --- a/src/mainboard/google/sarien/variants/sarien/devicetree.cb +++ b/src/mainboard/google/sarien/variants/sarien/devicetree.cb @@ -221,14 +221,17 @@ chip soc/intel/cannonlake end device pci 14.5 off end # SDCard device pci 15.0 on - chip drivers/i2c/generic - register "hid" = ""MLFS0000"" - register "desc" = ""Melfas Touchscreen"" - register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" - register "probed" = "1" - register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" - register "enable_delay_ms" = "5" - register "has_power_resource" = "1" + chip drivers/i2c/hid + register "generic.hid" = ""ACPI0C50"" + register "generic.desc" = ""Touchscreen"" + register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" + register "generic.probed" = "1" + register "generic.enable_gpio" = + "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" + register "generic.enable_delay_ms" = "5" + register "generic.enable_off_delay_ms" = "100" + register "generic.has_power_resource" = "1" + register "hid_desc_reg_offset" = "0x0" device i2c 10 on end end end # I2C #0 -- cgit v1.2.3