Kevin Chiu (Kevin.Chiu@quantatw.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17257
-gerrit
commit 77b66d5ff0ad789f36786afc58ce79dbae5a3625 Author: Janice Li janice.li@quantatw.com Date: Mon Nov 7 17:49:44 2016 +0800
i2c/wacom_ts: Update WACOM touchscreen ACPI HID
Modify WACOM ACPI HID WCOMNTN2 for Pyro to support touch screen FW update
BRANCH=master BUG=chrome-os-partner:58093 TEST=emerge-pyro vboot_reference coreboot chromeos-bootimage Signed-off-by: Janice Li janice.li@quantatw.com Change-Id: I95cf357efba958d7e864d2736d324e0aad70e307 --- src/drivers/i2c/wacom_ts/chip.h | 1 + src/drivers/i2c/wacom_ts/ts.c | 1 + src/mainboard/google/reef/variants/pyro/devicetree.cb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/drivers/i2c/wacom_ts/chip.h b/src/drivers/i2c/wacom_ts/chip.h index b59f630..268d212 100644 --- a/src/drivers/i2c/wacom_ts/chip.h +++ b/src/drivers/i2c/wacom_ts/chip.h @@ -23,6 +23,7 @@ #define WCOM_TS_DESC "WCOM Touchscreen"
struct drivers_i2c_wacom_ts_config { + const char *hid; /* ACPI _HID (required) */ struct drivers_i2c_generic_config generic; uint8_t hid_desc_reg_offset; }; diff --git a/src/drivers/i2c/wacom_ts/ts.c b/src/drivers/i2c/wacom_ts/ts.c index ebc8883..96d4853 100644 --- a/src/drivers/i2c/wacom_ts/ts.c +++ b/src/drivers/i2c/wacom_ts/ts.c @@ -21,6 +21,7 @@ static void i2c_wacom_ts_fill_dsm(struct device *dev) { struct drivers_i2c_wacom_ts_config *config = dev->chip_info; + config->generic.hid = config->hid; struct dsm_i2c_hid_config dsm_config = { .hid_desc_reg_offset = config->hid_desc_reg_offset, }; diff --git a/src/mainboard/google/reef/variants/pyro/devicetree.cb b/src/mainboard/google/reef/variants/pyro/devicetree.cb index a0ba584..50107ce 100644 --- a/src/mainboard/google/reef/variants/pyro/devicetree.cb +++ b/src/mainboard/google/reef/variants/pyro/devicetree.cb @@ -132,8 +132,8 @@ chip soc/intel/apollolake end # - I2C 2 device pci 16.3 on chip drivers/i2c/wacom_ts + register "hid" = ""WCOMNTN2""; register "generic" = "{ - .hid = WCOM50C1_HID, .cid = PNP0C50_CID, .desc = WCOM_TS_DESC, .irq = IRQ_EDGE_LOW(GPIO_21_IRQ),