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

mb/google/brya/var/{anahera, anahera4es}: Fix PLD group order 

In ec/google/chromeec: Add PLD to EC conn in ACPI table
(667471b8d8), PLD is added to ACPI table.

This patch ensures USB _PLD group numbers are appear in order.

BUG=b:216490477
TEST=build coreboot and system boot into OS.

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I0c72a5c5306d63c5fce24bf727704d212d0ad0f8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62023
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
This commit is contained in:
Subrata Banik 2022-02-16 13:52:52 +05:30 committed by Felix Held
parent 895691a783
commit 5a0432182f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mainboard/google/brya/variants/anahera/overridetree.cb
View File

@ -319,7 +319,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL, .shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}" .group = ACPI_PLD_GROUP(2, 1)}"
device ref tcss_usb3_port3 on end device ref tcss_usb3_port3 on end
end end
end end
@ -349,11 +349,11 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_LEFT, .panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 2)}" .group = ACPI_PLD_GROUP(3, 2)}"
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 (DB)"" 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 "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "{ register "custom_pld" = "{
@ -361,7 +361,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL, .shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}" .group = ACPI_PLD_GROUP(2, 1)}"
device ref usb2_port3 on end device ref usb2_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -383,7 +383,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 1)}" .group = ACPI_PLD_GROUP(3, 1)}"
device ref usb2_port9 on end device ref usb2_port9 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -402,7 +402,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 1)}" .group = ACPI_PLD_GROUP(3, 1)}"
device ref usb3_port1 on end device ref usb3_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -414,7 +414,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_LEFT, .panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 2)}" .group = ACPI_PLD_GROUP(3, 2)}"
device ref usb3_port3 on end device ref usb3_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi

14
src/mainboard/google/brya/variants/anahera4es/overridetree.cb
View File

@ -311,7 +311,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL, .shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}" .group = ACPI_PLD_GROUP(2, 1)}"
device ref tcss_usb3_port3 on end device ref tcss_usb3_port3 on end
end end
end end
@ -341,11 +341,11 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_LEFT, .panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 2)}" .group = ACPI_PLD_GROUP(3, 2)}"
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 (DB)"" 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 "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "{ register "custom_pld" = "{
@ -353,7 +353,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_OVAL, .shape = PLD_SHAPE_OVAL,
.group = ACPI_PLD_GROUP(3, 1)}" .group = ACPI_PLD_GROUP(2, 1)}"
device ref usb2_port3 on end device ref usb2_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -375,7 +375,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 1)}" .group = ACPI_PLD_GROUP(3, 1)}"
device ref usb2_port9 on end device ref usb2_port9 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -394,7 +394,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_RIGHT, .panel = PLD_PANEL_RIGHT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 1)}" .group = ACPI_PLD_GROUP(3, 1)}"
device ref usb3_port1 on end device ref usb3_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -406,7 +406,7 @@ chip soc/intel/alderlake
.panel = PLD_PANEL_LEFT, .panel = PLD_PANEL_LEFT,
.horizontal_position = PLD_HORIZONTAL_POSITION_LEFT, .horizontal_position = PLD_HORIZONTAL_POSITION_LEFT,
.shape = PLD_SHAPE_HORIZONTAL_RECTANGLE, .shape = PLD_SHAPE_HORIZONTAL_RECTANGLE,
.group = ACPI_PLD_GROUP(4, 2)}" .group = ACPI_PLD_GROUP(3, 2)}"
device ref usb3_port3 on end device ref usb3_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi