[coreboot-gerrit] [XS] Change in coreboot[master]: mb/google/rex: Fix PLD for USB type-A port

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75911?usp=email )

Change subject: mb/google/rex: Fix PLD for USB type-A port
......................................................................

mb/google/rex: Fix PLD for USB type-A port

USB type-A port with same PLD.token information as USB type-C port,
causes conflict while generating ACPI code for the EC CONN device.

Use a different PLD.token number for type-A port to fix the issue.

BUG=b:286328285
TEST=check ACPI can have right USB port in EC CON.
before patch:
                        Package (0x02)
                        {
                            "usb2-port",
                            _SB.PCI0.XHCI.RHUB.HS01
                        },

Package (0x02)
                        {
                            "usb3-port",
                            _SB.PCI0.TXHC.RHUB.SS01
                        },
after patch:
                        Package (0x02)
                        {
                            "usb2-port",
                            _SB.PCI0.XHCI.RHUB.HS01
                        },

Package (0x02)
                        {
                            "usb3-port",
                            _SB.PCI0.TXHC.RHUB.SS03
                        },

Signed-off-by: Kapil Porwal 
Change-Id: If3e76c11dd6808eee4c9c2f3f71604a60379b5a5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75911
Tested-by: build bot (Jenkins) 
Reviewed-by: Eric Lai 
Reviewed-by: Subrata Banik 
Reviewed-by: Tarun Tuli 
---
M src/mainboard/google/rex/variants/rex0/overridetree.cb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Subrata Banik: Looks good to me, approved
  Eric Lai: Looks good to me, approved
  build bot (Jenkins): Verified
  Tarun Tuli: Looks good to me, approved

diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb
index 5cfda3a..4f74ea4 100644
--- a/src/mainboard/google/rex/variants/rex0/overridetree.cb
+++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb
@@ -386,7 +386,7 @@
    					register "desc" = ""USB2 Type-A Port A0 (DB)""
    					register "type" = "UPC_TYPE_A"
    					register "use_custom_pld" = "true"
-						register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 2))"
+						register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(3, 1))"
    					device ref usb2_port9 on end
    				end
    				chip drivers/usb/acpi
@@ -399,7 +399,7 @@
    					register "desc" = ""USB3 Type-A Port A0 (DB)""
    					register "type" = "UPC_TYPE_USB3_A"
    					register "use_custom_pld" = "true"
-						register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 2))"
+						register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(3, 1))"
    					device ref usb3_port1 on end
    				end
    				chip drivers/usb/acpi