mb/google/brya/var/vell: update overridetree for DP
update override devicetree for type-c display based on schematics
BUG=b:209489126
TEST=emerge-brya coreboot
Signed-off-by: Shon Wang <shon.wang@quanta.corp-partner.google.com>
Change-Id: Icd2f5de38df0eb89fb92ea2abe25851c0d6ec53f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60251
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
diff --git a/src/mainboard/google/brya/variants/vell/overridetree.cb b/src/mainboard/google/brya/variants/vell/overridetree.cb
index 4f5da7f..825b305 100644
--- a/src/mainboard/google/brya/variants/vell/overridetree.cb
+++ b/src/mainboard/google/brya/variants/vell/overridetree.cb
@@ -46,9 +46,8 @@
#| | for TPM communication |
#| I2C5 | Trackpad |
#+-------------------+---------------------------+
- register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" # Type-A MLB Port
- register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Smart Card
- register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3/2 Type A MLB port
+ register "usb2_ports[4]" = "USB2_PORT_TYPE_C(OC3)" # USB2_C3
+
# I2C Port Config
register "SerialIoI2cMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoPci,
@@ -246,6 +245,8 @@
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
+ use conn2 as mux_conn[2]
+ use conn3 as mux_conn[3]
device pnp 0c09.0 on end
end
end
@@ -258,9 +259,19 @@
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
+ device generic 1 alias conn1 on end
+ end
+ chip drivers/intel/pmc_mux/conn
use usb2_port3 as usb2_port
use tcss_usb3_port3 as usb3_port
- device generic 1 alias conn1 on end
+ device generic 2 alias conn2 on end
+ end
+ chip drivers/intel/pmc_mux/conn
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port4 as usb3_port
+ device generic 3 alias conn3 on end
end
end
end
@@ -275,11 +286,23 @@
device ref tcss_usb3_port1 on end
end
chip drivers/usb/acpi
- register "desc" = ""USB3 Type-C Port C2 (MLB)""
+ register "desc" = ""USB3 Type-C Port C1 (MlB)""
+ register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+ register "group" = "ACPI_PLD_GROUP(2, 1)"
+ device ref tcss_usb3_port2 on end
+ end
+ chip drivers/usb/acpi
+ register "desc" = ""USB3 Type-C Port C2 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(3, 1)"
device ref tcss_usb3_port3 on end
end
+ chip drivers/usb/acpi
+ register "desc" = ""USB3 Type-C Port C3 (DB)""
+ register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+ register "group" = "ACPI_PLD_GROUP(5, 1)"
+ device ref tcss_usb3_port4 on end
+ end
end
end
end
@@ -293,11 +316,11 @@
device ref usb2_port1 on end
end
chip drivers/usb/acpi
- register "desc" = ""USB2 Type-A Port (MLB)""
- register "type" = "UPC_TYPE_A"
- register "group" = "ACPI_PLD_GROUP(4, 2)"
+ register "desc" = ""USB2 Type-C Port C1 (MLB)""
+ register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+ register "group" = "ACPI_PLD_GROUP(2, 1)"
device ref usb2_port2 on end
- end
+ end
chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C2 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
@@ -310,36 +333,17 @@
device ref usb2_port4 on end
end
chip drivers/usb/acpi
+ register "desc" = ""USB2 Type-C Port C3 (DB)""
+ register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+ register "group" = "ACPI_PLD_GROUP(5, 1)"
+ device ref usb2_port5 on end
+ end
+ chip drivers/usb/acpi
register "desc" = ""USB2 Camera""
register "type" = "UPC_TYPE_INTERNAL"
device ref usb2_port6 on end
end
chip drivers/usb/acpi
- register "desc" = ""USB2 Type-A Port (DB)""
- register "type" = "UPC_TYPE_A"
- register "group" = "ACPI_PLD_GROUP(4, 1)"
- device ref usb2_port9 on end
- end
- chip drivers/usb/acpi
- register "desc" = ""USB2 Bluetooth""
- register "type" = "UPC_TYPE_INTERNAL"
- register "reset_gpio" =
- "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)"
- device ref usb2_port10 on end
- end
- chip drivers/usb/acpi
- register "desc" = ""USB3 Type-A Port (DB)""
- register "type" = "UPC_TYPE_USB3_A"
- register "group" = "ACPI_PLD_GROUP(4, 1)"
- device ref usb3_port1 on end
- end
- chip drivers/usb/acpi
- register "desc" = ""USB3 Type-A Port (MLB)""
- register "type" = "UPC_TYPE_USB3_A"
- register "group" = "ACPI_PLD_GROUP(4, 2)"
- device ref usb3_port3 on end
- end
- chip drivers/usb/acpi
register "desc" = ""USB3 WWAN""
register "type" = "UPC_TYPE_INTERNAL"
device ref usb3_port4 on end