summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/devicetree.cb15
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/gpio.c2
2 files changed, 15 insertions, 2 deletions
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
index a548ac98fd67..d74588df60fb 100644
--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
@@ -308,7 +308,20 @@ chip soc/intel/skylake
end
end # I2C #1
device pci 15.2 on end # I2C #2
- device pci 15.3 on end # I2C #3
+ device pci 15.3 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""ACPI0C50""
+ register "generic.cid" = ""PNP0C50""
+ register "generic.desc" = ""Digitizer device""
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_A22_IRQ)"
+ register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C9)"
+ register "generic.has_power_resource" = "1"
+ register "generic.disable_gpio_export_in_crs" = "1"
+ register "generic.wake" = "GPE0_DW0_21"
+ register "hid_desc_reg_offset" = "0x1"
+ device i2c 0x9 on end
+ end
+ end # I2C #3
device pci 16.0 on end # Management Engine Interface 1
device pci 16.1 off end # Management Engine Interface 2
device pci 16.2 off end # Management Engine IDE-R
diff --git a/src/mainboard/google/poppy/variants/nautilus/gpio.c b/src/mainboard/google/poppy/variants/nautilus/gpio.c
index ca05ae9abbcd..2a76fd1e0151 100644
--- a/src/mainboard/google/poppy/variants/nautilus/gpio.c
+++ b/src/mainboard/google/poppy/variants/nautilus/gpio.c
@@ -130,7 +130,7 @@ static const struct pad_config gpio_table[] = {
/* C8 : UART0_RXD ==> NC */
PAD_CFG_NC(GPP_C8),
/* C9 : UART0_TXD ==> CHP3_P3.3V_DX_DIG_EN */
- PAD_CFG_GPO(GPP_C9, 1, DEEP),
+ PAD_CFG_GPO(GPP_C9, 0, DEEP),
/* C10 : UART0_RTS# ==> CHP3_CAM_PMIC_RST_L */
PAD_CFG_GPO(GPP_C10, 1, DEEP),
/* C11 : UART0_CTS# ==> CHP3_P3.3V_DX_CAM_EN */