summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Zhou <chris_zhou@compal.corp-partner.google.com>2019-01-24 16:09:42 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-01-28 13:36:07 +0000
commitdaeaa772a2fa9fe7bab666de396b9dcead4510d4 (patch)
treec581cf9f94142204035ad4880c7e97bb85ca2663 /src
parentdf3064227fb252ccf0ffac6419910bdd6f6ec536 (diff)
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 <chris_zhou@compal.corp-partner.google.com> Change-Id: If04a2904a0f72a6c8363ab2c9865926c71cb5186 Reviewed-on: https://review.coreboot.org/c/31062 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Lijian Zhao <lijian.zhao@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/sarien/variants/sarien/devicetree.cb19
1 files changed, 11 insertions, 8 deletions
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