From 5e4166c1ae18e975d28b867d56aff9235b27e0bb Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 17 May 2017 02:33:47 +0000 Subject: [PATCH] Revert "Revert "UPSTREAM: mb/google/eve: switch touchpad devicetree to i2c-hid and cros_ec i2c device"" This reverts commit 6434755b964854122949af887b965142115e026e. Revert the revert to get the touchpad ID ready for the new touchpad firmware again. BUG=b:35581264 BRANCH=none TEST=none Change-Id: I0c70f2c7c844d9199b9098783c24a6a0460263cc Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/506785 Reviewed-by: Furquan Shaikh --- src/mainboard/google/eve/devicetree.cb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb index 4e59338ca5..a7388b945b 100644 --- a/src/mainboard/google/eve/devicetree.cb +++ b/src/mainboard/google/eve/devicetree.cb @@ -245,12 +245,18 @@ chip soc/intel/skylake end end # I2C #1 device pci 15.2 on - chip drivers/i2c/generic - register "hid" = ""GOOG5400"" - register "desc" = ""Touchpad"" - register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_B3_IRQ)" + chip drivers/i2c/hid + register "generic.hid" = ""ACPI0C50"" + register "generic.desc" = ""Touchpad"" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_B3_IRQ)" + register "hid_desc_reg_offset" = "0x1" device i2c 49 on end end + chip drivers/i2c/generic + register "hid" = ""GOOG0008"" + register "desc" = ""Touchpad EC Interface"" + device i2c 1e on end + end end # I2C #2 device pci 15.3 off end # I2C #3 device pci 16.0 on end # Management Engine Interface 1