summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/poppy/variants/atlas/devicetree.cb12
-rw-r--r--src/mainboard/google/poppy/variants/atlas/gpio.c4
2 files changed, 13 insertions, 3 deletions
diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
index 1dc981e633..34bc4d45b7 100644
--- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
@@ -258,7 +258,17 @@ chip soc/intel/skylake
device pci 14.0 on end # USB xHCI
device pci 14.1 on end # USB xDCI (OTG)
device pci 14.2 on end # Thermal Subsystem
- device pci 15.0 on end # I2C #0 - Touchscreen
+ device pci 15.0 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""ACPI0C50""
+ register "generic.desc" = ""STM Touchscreen""
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)"
+ register "generic.speed" = "I2C_SPEED_FAST"
+ register "generic.probed" = "1"
+ register "hid_desc_reg_offset" = "0xab"
+ device i2c 0x49 on end
+ end
+ end # I2C #0 - Touchscreen
device pci 15.1 off end # I2C #1
device pci 15.2 on
chip drivers/i2c/hid
diff --git a/src/mainboard/google/poppy/variants/atlas/gpio.c b/src/mainboard/google/poppy/variants/atlas/gpio.c
index acaa22512b..3a7b722648 100644
--- a/src/mainboard/google/poppy/variants/atlas/gpio.c
+++ b/src/mainboard/google/poppy/variants/atlas/gpio.c
@@ -156,7 +156,7 @@ static const struct pad_config gpio_table[] = {
/* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */
PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
/* C22 : UART2_RTS# ==> EN_PP3300_DX_TOUCHSCREEN */
- PAD_CFG_GPO(GPP_C22, 0, DEEP),
+ PAD_CFG_GPO(GPP_C22, 1, DEEP),
/* C23 : UART2_CTS# ==> PCH_WP */
PAD_CFG_GPI_GPIO_DRIVER(GPP_C23, 20K_PU, DEEP),
@@ -232,7 +232,7 @@ static const struct pad_config gpio_table[] = {
/* E10 : USB2_OC1# ==> USB_C1_OC_ODL */
PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1),
/* E11 : USB2_OC2# ==> TOUCHSCREEN_RESET_L */
- PAD_CFG_GPO(GPP_E11, 0, DEEP),
+ PAD_CFG_GPO(GPP_E11, 1, DEEP),
/* E12 : USB2_OC3# ==> NC */
PAD_CFG_NC(GPP_E12),
/* E13 : DDPB_HPD0 ==> USB_C1_DP_HPD */