summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Lai <ericr_lai@compal.corp-partner.google.com>2020-04-23 17:14:33 +0800
committerTim Wawrzynczak <twawrzynczak@chromium.org>2020-04-27 19:37:35 +0000
commit780639b4ede3beae8708dbc8046d8ae24a450e65 (patch)
tree288dabf805dfba342dcf2f4b91f58190c24514f1
parent1a82923fd20a500d302c8df73414ce85141a327d (diff)
mb/google/deltaur: Move the code under domain
Chip drivers not overrided if out of domain. Only device can get override, so move the code under domain. BUG=b:152924290,b:152931802 TEST=Touch screen and Touch pad can work well. Signed-off-by: Eric Lai <ericr_lai@compal.corp-partner.google.com> Change-Id: Iaaa73e36ec268d26ebd3cafab79179fe22a926a7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/40655 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/deltaur/variants/deltan/overridetree.cb63
1 files changed, 31 insertions, 32 deletions
diff --git a/src/mainboard/google/deltaur/variants/deltan/overridetree.cb b/src/mainboard/google/deltaur/variants/deltan/overridetree.cb
index 13883d1ac0..01935c549b 100644
--- a/src/mainboard/google/deltaur/variants/deltan/overridetree.cb
+++ b/src/mainboard/google/deltaur/variants/deltan/overridetree.cb
@@ -7,37 +7,36 @@ chip soc/intel/tigerlake
device domain 0 on
device pci 1f.6 on end # GbE 0x15FC
+ device pci 15.0 on
+ chip drivers/i2c/generic
+ register "hid" = ""MLFS0000""
+ register "desc" = ""Melfas Touchscreen""
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E1_IRQ)"
+ register "probed" = "1"
+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A10)"
+ register "reset_delay_ms" = "10"
+ register "reset_off_delay_ms" = "5"
+ register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B3)"
+ register "stop_delay_ms" = "10"
+ register "enable_gpio" =
+ "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B21)"
+ register "enable_delay_ms" = "55"
+ register "has_power_resource" = "1"
+ register "device_present_gpio" = "GPP_B4"
+ register "device_present_gpio_invert" = "1"
+ device i2c 34 on end
+ end
+ end # I2C #0
+ device pci 15.1 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""PNP0C50""
+ register "generic.desc" = ""Cirque Touchpad""
+ register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_E7_IRQ)"
+ register "generic.probed" = "1"
+ register "generic.wake" = "GPE0_DW1_07"
+ register "hid_desc_reg_offset" = "0x20"
+ device i2c 2c on end
+ end
+ end # I2C #1
end
-
- device pci 15.0 on
- chip drivers/i2c/generic
- register "hid" = ""MLFS0000""
- register "desc" = ""Melfas Touchscreen""
- register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E1_IRQ)"
- register "probed" = "1"
- register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A10)"
- register "reset_delay_ms" = "10"
- register "reset_off_delay_ms" = "5"
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B3)"
- register "stop_delay_ms" = "10"
- register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B21)"
- register "enable_delay_ms" = "55"
- register "has_power_resource" = "1"
- register "device_present_gpio" = "GPP_B4"
- register "device_present_gpio_invert" = "1"
- device i2c 34 on end
- end
- end # I2C #0
-
- device pci 15.1 on
- chip drivers/i2c/hid
- register "generic.hid" = ""PNP0C50""
- register "generic.desc" = ""Cirque Touchpad""
- register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_E7_IRQ)"
- register "generic.probed" = "1"
- register "generic.wake" = "GPE0_DW1_07"
- register "hid_desc_reg_offset" = "0x20"
- device i2c 2c on end
- end
- end # I2C #1
end