From 7474b976de8b3fe4cd41ab0174da166b4d08ba57 Mon Sep 17 00:00:00 2001 From: Kevin Chiu Date: Sat, 4 Feb 2017 03:55:01 +0800 Subject: [PATCH] UPSTREAM: Revert "google/pyro: remove Wacom touchscreen probed flag" Reason for revert: Pyro has two touchscreen sources: WACOM/ELAN. It will not have both touchscreen IC in one system at the same time. So the "probed" property of WACOM i2c device is mandatory to set for kernel to know whether it exists before driver initializes it. Otherwise in ELAN case, when driver fails to init WACOM i2c device, ACPI _OFF will be invoked to set GPIO#152 low to cut off power. BUG=chrome-os-partner:62371 BRANCH=reef TEST=emerge-pyro coreboot Change-Id: I2fc9f668bc20630d69026e4440142d05a01fd89b Signed-off-by: Patrick Georgi Original-Commit-Id: b576e6f236fd374421287f39542a9e26608406ff Original-Change-Id: I30f467bd8720d959686dc14f7877e6bc11ea6213 Original-Signed-off-by: Kevin Chiu Original-Reviewed-on: https://review.coreboot.org/18291 Original-Reviewed-by: Aaron Durbin Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/438050 --- src/mainboard/google/reef/variants/pyro/devicetree.cb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mainboard/google/reef/variants/pyro/devicetree.cb b/src/mainboard/google/reef/variants/pyro/devicetree.cb index 72ad57c567..c36d19d94c 100644 --- a/src/mainboard/google/reef/variants/pyro/devicetree.cb +++ b/src/mainboard/google/reef/variants/pyro/devicetree.cb @@ -187,6 +187,7 @@ chip soc/intel/apollolake .cid = PNP0C50_CID, .desc = WCOM_TS_DESC, .irq = IRQ_LEVEL_LOW(GPIO_21_IRQ), + .probed = 1, .reset_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36), .reset_delay_ms = 20, .enable_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_152),