[coreboot-gerrit] Change in coreboot[master]: mb/google/brya: Enable MLB USB Type-A Port

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50816 )

Change subject: mb/google/brya: Enable MLB USB Type-A Port
......................................................................

mb/google/brya: Enable MLB USB Type-A Port

The USB Type-A port on the MLB was added to the schematic at the last
minute and it was missed when adding brya0's overridetree. Also fix
a few USB ACPI entries.

BUG=b:180403898
TEST=`lsusb` shows plugged-in flash drive

Change-Id: I8bf96a8b365cb4ea2fc07d7cf673b08e8872ff88
Signed-off-by: Tim Wawrzynczak 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50816
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: EricR Lai 
Reviewed-by: Angel Pons 
---
M src/mainboard/google/brya/variants/brya0/overridetree.cb
1 file changed, 22 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  EricR Lai: Looks good to me, approved

diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
index df67048..030d19e 100644
--- a/src/mainboard/google/brya/variants/brya0/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb
@@ -5,6 +5,10 @@

register "SaGv" = "SaGv_Disabled"

+	register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A MLB Port
+
+	register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3/2 Type A MLB port
+
    device domain 0 on
    	device ref cnvi_wifi on
    		chip drivers/wifi/generic
@@ -204,19 +208,19 @@
    				chip drivers/usb/acpi
    					register "desc" = ""USB3 Type-C Port C0 (MLB)""
    					register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(4, 1)"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
    					device ref tcss_usb3_port1 on end
    				end
    				chip drivers/usb/acpi
    					register "desc" = ""USB3 Type-C Port C1 (DB)""
    					register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(3, 2)"
+						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 (MLB)""
    					register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(4, 2)"
+						register "group" = "ACPI_PLD_GROUP(3, 1)"
    					device ref tcss_usb3_port3 on end
    				end
    			end
@@ -254,7 +258,13 @@
    					device ref usb2_port6 on end
    				end
    				chip drivers/usb/acpi
-						register "desc" = ""USB2 Type-A Port A0 (MLB)""
+						register "desc" = ""USB2 Type-A Port (MLB)""
+						register "type" = "UPC_TYPE_A"
+						register "group" = "ACPI_PLD_GROUP(4, 1)"
+						device ref usb2_port8 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB2 Type-A Port A0 (DB)""
    					register "type" = "UPC_TYPE_A"
    					register "group" = "ACPI_PLD_GROUP(1, 2)"
    					device ref usb2_port9 on end
@@ -267,15 +277,21 @@
    					device ref usb2_port10 on end
    				end
    				chip drivers/usb/acpi
-						register "desc" = ""USB3 Type-A Port A0 (MLB)""
+						register "desc" = ""USB3 Type-A Port A0 (DB)""
    					register "type" = "UPC_TYPE_USB3_A"
    					register "group" = "ACPI_PLD_GROUP(1, 2)"
    					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, 1)"
+						device ref usb3_port2 on end
+					end
+					chip drivers/usb/acpi
    					register "desc" = ""USB3 WWAN""
    					register "type" = "UPC_TYPE_INTERNAL"
-						device ref usb3_port3 on end
+						device ref usb3_port4 on end
    				end
    			end
    		end