Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56725 )
Change subject: mb/google/guybrush: Document USB mapping in devicetree ......................................................................
mb/google/guybrush: Document USB mapping in devicetree
Add a short documenting comment to each usb entry in devicetree so it is clear which function each usb port maps to. Fix inverted mapping in drivers/usb/acpi.
BUG=None TEST=Build BRANCH=None
Change-Id: I14cbb6af021bb27c89aa82456722f21aa09617be Signed-off-by: Rob Barnes robbarnes@google.com --- M src/mainboard/google/guybrush/variants/baseboard/devicetree.cb 1 file changed, 20 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/56725/1
diff --git a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb index cf0f515..902a416 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb @@ -62,6 +62,7 @@
register "usb_phy_custom" = "1" register "usb_phy" = "{ + /* Left USB C0 Port */ .Usb2PhyPort[0] = { .compdstune = 3, .sqrxtune = 3, @@ -73,6 +74,7 @@ .txhsxvtune = 3, .txrestune = 1, }, + /* Left USB A0 Port or WWAN */ .Usb2PhyPort[1] = { .compdstune = 3, .sqrxtune = 3, @@ -84,6 +86,7 @@ .txhsxvtune = 3, .txrestune = 1, }, + /* User facing camera */ .Usb2PhyPort[2] = { .compdstune = 1, .sqrxtune = 3, @@ -95,6 +98,7 @@ .txhsxvtune = 3, .txrestune = 2, }, + /* World facing camera */ .Usb2PhyPort[3] = { .compdstune = 1, .sqrxtune = 3, @@ -106,6 +110,7 @@ .txhsxvtune = 3, .txrestune = 2, }, + /* Right USB C1 Port */ .Usb2PhyPort[4] = { .compdstune = 3, .sqrxtune = 3, @@ -117,6 +122,7 @@ .txhsxvtune = 3, .txrestune = 1, }, + /* Right USB A1 Port */ .Usb2PhyPort[5] = { .compdstune = 3, .sqrxtune = 3, @@ -128,6 +134,7 @@ .txhsxvtune = 3, .txrestune = 1, }, + /* WiFi / Bluetooth */ .Usb2PhyPort[6] = { .compdstune = 1, .sqrxtune = 3, @@ -139,6 +146,7 @@ .txhsxvtune = 3, .txrestune = 2, }, + /* Smart Card */ .Usb2PhyPort[7] = { .compdstune = 1, .sqrxtune = 3, @@ -150,25 +158,28 @@ .txhsxvtune = 3, .txrestune = 2, }, - + /* Left USB C0 Port */ .Usb3PhyPort[0] = { .tx_term_ctrl=2, .rx_term_ctrl=2, .tx_vboost_lvl_en=1, .tx_vboost_lvl=5, }, + /* Left USB A0 Port or WWAN */ .Usb3PhyPort[1] = { .tx_term_ctrl=2, .rx_term_ctrl=2, .tx_vboost_lvl_en=1, .tx_vboost_lvl=5, }, + /* Right USB C1 Port */ .Usb3PhyPort[2] = { .tx_term_ctrl=2, .rx_term_ctrl=2, .tx_vboost_lvl_en=1, .tx_vboost_lvl=5, }, + /* Right USB A1 Port */ .Usb3PhyPort[3] = { .tx_term_ctrl=2, .rx_term_ctrl=2, @@ -210,25 +221,25 @@ chip drivers/usb/acpi device ref xhci_0_root_hub on chip drivers/usb/acpi - register "desc" = ""Right Type-C Port"" + register "desc" = ""Left Type-C Port"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(1, 1)" device ref usb3_port0 on end end chip drivers/usb/acpi - register "desc" = ""Right Type-A Port"" + register "desc" = ""Left Type-A Port"" 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" = ""Right Type-C Port"" + register "desc" = ""Left Type-C Port"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(1, 1)" device ref usb2_port0 on end end chip drivers/usb/acpi - register "desc" = ""Right Type-A Port"" + register "desc" = ""Left Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" device ref usb2_port1 on end @@ -250,25 +261,25 @@ chip drivers/usb/acpi device ref xhci_1_root_hub on chip drivers/usb/acpi - register "desc" = ""Left Type-C Port"" + register "desc" = ""Right Type-C Port"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(2, 2)" device ref usb3_port4 on end end chip drivers/usb/acpi - register "desc" = ""Left Type-A Port"" + register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 1)" device ref usb3_port5 on end end chip drivers/usb/acpi - register "desc" = ""Left Type-C Port"" + register "desc" = ""Right Type-C Port"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(2, 2)" device ref usb2_port4 on end end chip drivers/usb/acpi - register "desc" = ""Left Type-A Port"" + register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 1)" device ref usb2_port5 on end