sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/puff: configure USB PLD groups

Browse Source 
Each physical port should have the same group and position for both USB2
and USB3, but puff and its variants use different layout than the
baseboard so they must override PLD.

Ports are split into two groups for front and back, with positions in
each group numbered from left to right.

BUG=b:151579409
BRANCH=none
TEST=PLD_GroupToken and PLD_GroupPosition are set as expected in SSDT.

Change-Id: Ibe19e4faa1fbc7117687d789e9bd5584852a48c0
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40516
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Peter Marheine 2020-04-20 13:53:47 +10:00 committed by Edward O'Callaghan
parent 962c788861
commit c5028b2e86
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainboard/google/hatch/variants/duffy/overridetree.cb
View File

@ -191,31 +191,37 @@ chip soc/intel/cannonlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Left"" register "desc" = ""USB2 Type-A Front Left""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device usb 2.0 on end device usb 2.0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port Rear"" register "desc" = ""USB2 Type-C Port Rear""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 3)"
device usb 2.1 on end device usb 2.1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Right"" register "desc" = ""USB2 Type-A Front Right""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device usb 2.2 on end device usb 2.2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Right"" register "desc" = ""USB2 Type-A Rear Right""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 2)"
device usb 2.3 on end device usb 2.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Middle"" register "desc" = ""USB2 Type-A Rear Middle""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
device usb 2.4 on end device usb 2.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Left"" register "desc" = ""USB2 Type-A Rear Left""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 0)"
device usb 2.5 on end device usb 2.5 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -224,31 +230,37 @@ chip soc/intel/cannonlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Left"" register "desc" = ""USB3 Type-A Front Left""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device usb 3.0 on end device usb 3.0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Right"" register "desc" = ""USB3 Type-A Front Right""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device usb 3.1 on end device usb 3.1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Right"" register "desc" = ""USB3 Type-A Rear Right""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 2)"
device usb 3.2 on end device usb 3.2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Rear"" register "desc" = ""USB3 Type-C Rear""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 3)"
device usb 3.3 on end device usb 3.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Left"" register "desc" = ""USB3 Type-A Rear Left""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 0)"
device usb 3.4 on end device usb 3.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Middle"" register "desc" = ""USB3 Type-A Rear Middle""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
device usb 3.5 on end device usb 3.5 on end
end end
end end

12
src/mainboard/google/hatch/variants/kaisa/overridetree.cb
View File

@ -191,31 +191,37 @@ chip soc/intel/cannonlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Left"" register "desc" = ""USB2 Type-A Front Left""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device usb 2.0 on end device usb 2.0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port Rear"" register "desc" = ""USB2 Type-C Port Rear""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 3)"
device usb 2.1 on end device usb 2.1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Right"" register "desc" = ""USB2 Type-A Front Right""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device usb 2.2 on end device usb 2.2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Right"" register "desc" = ""USB2 Type-A Rear Right""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 2)"
device usb 2.3 on end device usb 2.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Middle"" register "desc" = ""USB2 Type-A Rear Middle""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
device usb 2.4 on end device usb 2.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Left"" register "desc" = ""USB2 Type-A Rear Left""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 0)"
device usb 2.5 on end device usb 2.5 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -224,31 +230,37 @@ chip soc/intel/cannonlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Left"" register "desc" = ""USB3 Type-A Front Left""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device usb 3.0 on end device usb 3.0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Right"" register "desc" = ""USB3 Type-A Front Right""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device usb 3.1 on end device usb 3.1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Right"" register "desc" = ""USB3 Type-A Rear Right""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 2)"
device usb 3.2 on end device usb 3.2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Rear"" register "desc" = ""USB3 Type-C Rear""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 3)"
device usb 3.3 on end device usb 3.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Left"" register "desc" = ""USB3 Type-A Rear Left""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 0)"
device usb 3.4 on end device usb 3.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Middle"" register "desc" = ""USB3 Type-A Rear Middle""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
device usb 3.5 on end device usb 3.5 on end
end end
end end

12
src/mainboard/google/hatch/variants/puff/overridetree.cb
View File

@ -191,31 +191,37 @@ chip soc/intel/cannonlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Left"" register "desc" = ""USB2 Type-A Front Left""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device usb 2.0 on end device usb 2.0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port Rear"" register "desc" = ""USB2 Type-C Port Rear""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 3)"
device usb 2.1 on end device usb 2.1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Right"" register "desc" = ""USB2 Type-A Front Right""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device usb 2.2 on end device usb 2.2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Right"" register "desc" = ""USB2 Type-A Rear Right""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 2)"
device usb 2.3 on end device usb 2.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Middle"" register "desc" = ""USB2 Type-A Rear Middle""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
device usb 2.4 on end device usb 2.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Left"" register "desc" = ""USB2 Type-A Rear Left""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 0)"
device usb 2.5 on end device usb 2.5 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -224,31 +230,37 @@ chip soc/intel/cannonlake
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Left"" register "desc" = ""USB3 Type-A Front Left""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device usb 3.0 on end device usb 3.0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Right"" register "desc" = ""USB3 Type-A Front Right""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device usb 3.1 on end device usb 3.1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Right"" register "desc" = ""USB3 Type-A Rear Right""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 2)"
device usb 3.2 on end device usb 3.2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Rear"" register "desc" = ""USB3 Type-C Rear""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(1, 3)"
device usb 3.3 on end device usb 3.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Left"" register "desc" = ""USB3 Type-A Rear Left""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 0)"
device usb 3.4 on end device usb 3.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Middle"" register "desc" = ""USB3 Type-A Rear Middle""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
device usb 3.5 on end device usb 3.5 on end
end end
end end