summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/skyrim/Kconfig1
-rw-r--r--src/mainboard/google/skyrim/variants/baseboard/devicetree.cb12
-rw-r--r--src/mainboard/google/skyrim/variants/skyrim/overridetree.cb42
3 files changed, 43 insertions, 12 deletions
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 5a60c987b6..a1b6349661 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_GENERIC_GPIO_KEYS
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_HID
+ select DRIVERS_USB_HUB
select DRIVERS_WIFI_GENERIC
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_ESPI
diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index f0d103957d..bfdc736cbc 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -105,24 +105,12 @@ chip soc/amd/sabrina
device ref usb3_port2 on end
end
chip drivers/usb/acpi
- register "desc" = ""Left Type-A Port""
- register "type" = "UPC_TYPE_USB3_A"
- register "group" = "ACPI_PLD_GROUP(2, 2)"
- device ref usb3_port3 on end
- end
- chip drivers/usb/acpi
register "desc" = ""Left Type-C Port""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(2, 1)"
device ref usb2_port2 on end
end
chip drivers/usb/acpi
- register "desc" = ""Left Type-A Port""
- register "type" = "UPC_TYPE_USB3_A"
- register "group" = "ACPI_PLD_GROUP(2, 2)"
- device ref usb2_port3 on end
- end
- chip drivers/usb/acpi
register "desc" = ""World-Facing Camera""
register "type" = "UPC_TYPE_INTERNAL"
device ref usb2_port4 on end
diff --git a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
index 3b33a5dee7..dd731ee24d 100644
--- a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
@@ -28,6 +28,48 @@ end
chip soc/amd/sabrina
device domain 0 on
+ device ref gpp_bridge_a on # Internal GPP Bridge 0 to Bus A
+ device ref xhci_1 on # XHCI1 controller
+ chip drivers/usb/acpi
+ device ref xhci_1_root_hub on # XHCI1 root hub
+ chip drivers/usb/acpi
+ device ref usb3_port3 on # USB 3.1 port3
+ chip drivers/usb/hub
+ register "desc" = ""USB Hub""
+ register "name" = ""VL822""
+ register "port_count" = "4"
+ device usb 0.0 on # VL822 USB3 hub
+ chip drivers/usb/acpi
+ register "desc" = ""Left Type-A Port""
+ register "type" = "UPC_TYPE_USB3_A"
+ register "group" = "ACPI_PLD_GROUP(2, 2)"
+ device usb 3.0 on end
+ end
+ end # VL822 USB3 hub
+ end
+ end # USB 3.1 port3
+ end
+ chip drivers/usb/acpi
+ device ref usb2_port3 on # USB 2 port3
+ chip drivers/usb/hub
+ register "desc" = ""USB Hub""
+ register "name" = ""VL822""
+ register "port_count" = "4"
+ device usb 0.0 on # VL822 USB2 hub
+ chip drivers/usb/acpi
+ register "desc" = ""Left Type-A Port""
+ register "type" = "UPC_TYPE_USB3_A"
+ register "group" = "ACPI_PLD_GROUP(2, 2)"
+ device usb 2.0 on end
+ end
+ end # VL822 USB2 hub
+ end
+ end # USB 2 port3
+ end
+ end # XHCI1 root hub
+ end
+ end # XHCI1 controller
+ end # Internal GPP Bridge 0 to Bus A
end # domain
# I2C Config