summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Zhou <chris_zhou@compal.corp-partner.google.com>2019-06-26 16:54:19 +0800
committerFurquan Shaikh <furquan@google.com>2019-07-03 05:34:58 +0000
commit84133b161c8be7cbb41fdbdb0196fd42375e141a (patch)
treef9b5f872c6c05382a42ae514921a9dd386bcab77 /src
parent593d1cf81725506315b5e647342318228fc1889e (diff)
downloadcoreboot-84133b161c8be7cbb41fdbdb0196fd42375e141a.tar.xz
mb/google/octopus/variants/fleex: Enable EMR function for Grob360S
Enable EMR Pen Stylus function for Grob360S BUG=b:135968368 BRANCH=octopus TEST=EMR function working normally with HW reworked Fleex. Change-Id: Ia220dc0d3051b79b110b4df66df108f701776478 Signed-off-by: Chris Zhou <chris_zhou@compal.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33802 Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com> Reviewed-by: Karthik Ramasubramanian <kramasub@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/octopus/variants/fleex/gpio.c3
-rw-r--r--src/mainboard/google/octopus/variants/fleex/overridetree.cb18
2 files changed, 19 insertions, 2 deletions
diff --git a/src/mainboard/google/octopus/variants/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c
index 89adfb8cb6..d2d0d641dc 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/gpio.c
@@ -30,7 +30,8 @@ static const struct pad_config default_override_table[] = {
PAD_NC(GPIO_138, UP_20K),
PAD_NC(GPIO_139, UP_20K),
- PAD_NC(GPIO_140, UP_20K),
+ /* GPIO_140 -- PEN_RESET */
+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_140, 0, DEEP, NONE, Tx1RxDCRx0, DISPUPD),
PAD_NC(GPIO_143, UP_20K),
PAD_NC(GPIO_144, UP_20K),
PAD_NC(GPIO_145, UP_20K),
diff --git a/src/mainboard/google/octopus/variants/fleex/overridetree.cb b/src/mainboard/google/octopus/variants/fleex/overridetree.cb
index 19246e0a51..da4e701641 100644
--- a/src/mainboard/google/octopus/variants/fleex/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/fleex/overridetree.cb
@@ -61,6 +61,9 @@ chip soc/intel/apollolake
.speed_mhz = 1,
.early_init = 1,
},
+ .i2c[0] = {
+ .speed = I2C_SPEED_FAST,
+ },
.i2c[5] = {
.speed = I2C_SPEED_FAST,
.rise_time_ns = 104,
@@ -80,7 +83,20 @@ chip soc/intel/apollolake
}"
device domain 0 on
- device pci 16.0 off end # - I2C 0
+ device pci 16.0 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""WCOM50C1""
+ register "generic.desc" = ""WCOM Digitizer""
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_139_IRQ)"
+ register "generic.reset_gpio" =
+ "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
+ register "generic.reset_delay_ms" = "20"
+ register "generic.has_power_resource" = "1"
+ register "generic.probed" = "1"
+ register "hid_desc_reg_offset" = "0x1"
+ device i2c 0x9 on end
+ end
+ end # - I2C 0
device pci 16.1 off end # - I2C 1
device pci 17.1 on
chip drivers/i2c/da7219