From 12e0be32f2177f7ef4100f648e5f10993a143370 Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Wed, 14 Jun 2023 14:08:59 +0800 Subject: [PATCH] mb/google/myst: Update WWAN usb entry USB3 is used for both typeA and WWAN based on different DB. BUG=b:287159026 TEST=change FW config and check typeA and WWAN can work. Signed-off-by: Eric Lai Change-Id: I5ad3973a9519350794a661ad00f71c0eb34edfba Reviewed-on: https://review.coreboot.org/c/coreboot/+/75819 Reviewed-by: Tim Van Patten Reviewed-by: Jon Murphy Tested-by: build bot (Jenkins) --- .../myst/variants/baseboard/devicetree.cb | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/mainboard/google/myst/variants/baseboard/devicetree.cb b/src/mainboard/google/myst/variants/baseboard/devicetree.cb index 01a4389d6f..f4cae225f5 100644 --- a/src/mainboard/google/myst/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/myst/variants/baseboard/devicetree.cb @@ -254,7 +254,21 @@ chip soc/amd/phoenix register "use_custom_pld" = "true" register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 2))" register "group" = "ACPI_PLD_GROUP(1, 2)" - device ref usb3_port3 on end + device ref usb3_port3 on + probe DAUGHTERBOARD DB_B + end + end + chip drivers/usb/acpi + register "desc" = ""USB3 WWAN"" + register "type" = "UPC_TYPE_INTERNAL" + register "has_power_resource" = "1" + register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_6)" + register "enable_delay_ms" = "20" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_11)" + register "reset_off_delay_ms" = "20" + device ref usb3_port3 on + probe WWAN WWAN_FM101GL + end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A0 (MLB)"" @@ -293,25 +307,6 @@ chip soc/amd/phoenix end end end - device ref xhci_1 on - chip drivers/usb/acpi - register "type" = "UPC_TYPE_HUB" - device ref xhci_1_root_hub on - chip drivers/usb/acpi - register "desc" = ""USB3 WWAN"" - register "type" = "UPC_TYPE_INTERNAL" - register "has_power_resource" = "1" - register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_6)" - register "enable_delay_ms" = "20" - register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_11)" - register "reset_off_delay_ms" = "20" - device ref usb3_port7 on - probe WWAN WWAN_FM101GL - end - end - end - end - end device ref acp on end # Audio Processor (ACP) device ref mp2 on end # Sensor Fusion Hub (MP2) end