google/eve: Enable touch devices
Enable the actual touch devices to be probed by the kernel
and remove the placeholder devices that I put in before
and were used for initial bringup.
BUG=chrome-os-partner:58666
TEST=tested on eve
Change-Id: I7fc6f9da83b1abbae6dd069f759b220d59153d1c
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://review.coreboot.org/17896
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb
index c96faf7..efcadd2 100644
--- a/src/mainboard/google/eve/devicetree.cb
+++ b/src/mainboard/google/eve/devicetree.cb
@@ -198,19 +198,14 @@
device pci 14.1 off end # USB xDCI (OTG)
device pci 14.2 on end # Thermal Subsystem
device pci 15.0 on
- chip drivers/i2c/generic
- register "hid" = ""ATML0001""
- register "desc" = ""Atmel Touchscreen""
- register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)"
- register "probed" = "1"
- device i2c 4b on end
- end
- chip drivers/i2c/generic
- register "hid" = ""ATML0001""
- register "desc" = ""Atmel Touchscreen Bootloader""
- register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)"
- register "probed" = "1"
- device i2c 27 on end
+ chip drivers/i2c/wacom
+ register "generic.hid" = "WCOM50C1_HID"
+ register "generic.cid" = "PNP0C50_CID"
+ register "generic.desc" = "WCOM_DT_DESC"
+ register "generic.irq" = "IRQ_LEVEL_LOW(GPP_E7_IRQ)"
+ register "generic.probed" = "1"
+ register "hid_desc_reg_offset" = "0x1"
+ device i2c 0a on end
end
end # I2C #0
device pci 15.1 on
@@ -221,19 +216,13 @@
end
end # I2C #1
device pci 15.2 on
- chip drivers/i2c/generic
- register "hid" = ""ATML0000""
- register "desc" = ""Atmel Touchpad""
- register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)"
- register "probed" = "1"
- device i2c 4a on end
- end
- chip drivers/i2c/generic
- register "hid" = ""ATML0000""
- register "desc" = ""Atmel Touchpad Bootloader""
- register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)"
- register "probed" = "1"
- device i2c 26 on end
+ chip drivers/i2c/hid
+ register "generic.hid" = ""ACPI0C50""
+ register "generic.desc" = ""Touchpad""
+ register "generic.irq" = "IRQ_LEVEL_LOW(GPP_B3_IRQ)"
+ register "generic.probed" = "1"
+ register "hid_desc_reg_offset" = "0x0"
+ device i2c 49 on end
end
end # I2C #2
device pci 15.3 off end # I2C #3