GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/brya: Add custom PLD fields to devicetree for brya reference 

For USB ports, we want to use custom PLD fields with more details to
indicate physical location. Custom PLD will also be added to other brya
variants in the future as we figure out physical port locations on those
devices. Type A port on MLB is removed since it is no longer used.

BUG=b:216490477
TEST=emerge-brya coreboot & SSDT dump in Brya test device

Signed-off-by: Won Chung <wonchung@google.com>
Change-Id: Iea975a4f436a204d4edd19fad0f5652fb44c6301
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61388
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
This commit is contained in:
Won Chung 2022-01-25 22:30:12 +00:00 committed by Felix Held
parent 55ba8df28c
commit f1a3f187ba
2 changed files with 112 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/mainboard/google/brya/variants/brya0/overridetree.cb
View File

@ -663,19 +663,37 @@ chip soc/intel/alderlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C0 (MLB)"" register "desc" = ""USB3 Type-C Port C0 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_CENTER,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(1, 1)}"
device ref tcss_usb3_port1 on end device ref tcss_usb3_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C1 (DB)"" register "desc" = ""USB3 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(2, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(2, 1)}"
device ref tcss_usb3_port2 on end device ref tcss_usb3_port2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C2 (MLB)"" register "desc" = ""USB3 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(3, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}"
device ref tcss_usb3_port3 on end device ref tcss_usb3_port3 on end
end end
end end
@ -687,19 +705,37 @@ chip soc/intel/alderlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C0 (MLB)"" register "desc" = ""USB2 Type-C Port C0 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_CENTER,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(1, 1)}"
device ref usb2_port1 on end device ref usb2_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C1 (DB)"" register "desc" = ""USB2 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(2, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(2, 1)}"
device ref usb2_port2 on end device ref usb2_port2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C2 (MLB)"" register "desc" = ""USB2 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(3, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}"
device ref usb2_port3 on end device ref usb2_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -714,16 +750,16 @@ chip soc/intel/alderlake
probe UFC UFC_USB probe UFC UFC_USB
end end
end end
chip drivers/usb/acpi
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 chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Port A0 (DB)"" register "desc" = ""USB2 Type-A Port A0 (DB)""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 2)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(1, 2)}"
device ref usb2_port9 on end device ref usb2_port9 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -736,15 +772,15 @@ chip soc/intel/alderlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Port A0 (DB)"" register "desc" = ""USB3 Type-A Port A0 (DB)""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 2)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(1, 2)}"
device ref usb3_port1 on end device ref usb3_port1 on end
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 chip drivers/usb/acpi
register "desc" = ""USB3 WWAN"" register "desc" = ""USB3 WWAN""
register "type" = "UPC_TYPE_INTERNAL" register "type" = "UPC_TYPE_INTERNAL"

76
src/mainboard/google/brya/variants/brya4es/overridetree.cb
View File

@ -659,19 +659,37 @@ chip soc/intel/alderlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C0 (MLB)"" register "desc" = ""USB3 Type-C Port C0 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_CENTER,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(1, 1)}"
device ref tcss_usb3_port1 on end device ref tcss_usb3_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C1 (DB)"" register "desc" = ""USB3 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(2, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(2, 1)}"
device ref tcss_usb3_port2 on end device ref tcss_usb3_port2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C2 (MLB)"" register "desc" = ""USB3 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(3, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}"
device ref tcss_usb3_port3 on end device ref tcss_usb3_port3 on end
end end
end end
@ -683,19 +701,37 @@ chip soc/intel/alderlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C0 (MLB)"" register "desc" = ""USB2 Type-C Port C0 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_CENTER,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(1, 1)}"
device ref usb2_port1 on end device ref usb2_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C1 (DB)"" register "desc" = ""USB2 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(2, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(2, 1)}"
device ref usb2_port2 on end device ref usb2_port2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C2 (MLB)"" register "desc" = ""USB2 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(3, 1)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}"
device ref usb2_port3 on end device ref usb2_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -710,16 +746,16 @@ chip soc/intel/alderlake
probe UFC UFC_USB probe UFC UFC_USB
end end
end end
chip drivers/usb/acpi
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 chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Port A0 (DB)"" register "desc" = ""USB2 Type-A Port A0 (DB)""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 2)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(1, 2)}"
device ref usb2_port9 on end device ref usb2_port9 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -732,15 +768,15 @@ chip soc/intel/alderlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Port A0 (DB)"" register "desc" = ""USB3 Type-A Port A0 (DB)""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 2)" register "use_custom_pld" = "true"
register "custom_pld" = "{
.visible = true,
.panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(1, 2)}"
device ref usb3_port1 on end device ref usb3_port1 on end
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 chip drivers/usb/acpi
register "desc" = ""USB3 WWAN"" register "desc" = ""USB3 WWAN""
register "type" = "UPC_TYPE_INTERNAL" register "type" = "UPC_TYPE_INTERNAL"