Attention is currently required from: Reka Norman, Tim Crawford, Jeremy Soller, Tim Wawrzynczak, Nick Vaccaro, Patrick Rudolph.
Hello build bot (Jenkins), Tim Crawford, Reka Norman, Jeremy Soller, Tim Wawrzynczak, Nick Vaccaro, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/60143
to look at the new patch set (#2).
Change subject: drivers/intel/pmc_mux/conn: Change usb{23}_port_number fields to device pointers
......................................................................
drivers/intel/pmc_mux/conn: Change usb{23}_port_number fields to device pointers
Currently, the pmc_mux/conn driver uses integer fields to store the
USB-2 and USB-3 port numbers from the SoC's point of view. Specifying
these as integers in the devicetree is error-prone, and this
information can instead be represented using pointers to the USB-2 and
USB-3 devices. The port numbers can then be obtained from the paths of
the linked devices, e.g. dev->path.usb.port_id.
Modify the driver to store device pointers instead of integer port
numbers, and update all devicetrees using the driver. These are the
mainboards affected (all are Intel TGL or ADL based):
google/brya
google/volteer
intel/adlrvp
intel/shadowmountain
intel/tglrvp
system76/darp7
system76/galp5
system76/lemp10
Command used to update the devicetrees:
git grep -l "usb._port_number" src/mainboard/ | \
xargs sed -i \
-e 's/register "usb2_port_number" = "\(.*\)"/use usb2_port\1 as usb2_port/g' \
-e 's/register "usb3_port_number" = "\(.*\)"/use tcss_usb3_port\1 as usb3_port/g'
BUG=b:208502191
TEST=Build test all affected boards. On brya0, boot device and check
that the ACPI tables generated with and without the change are the same.
Change-Id: I5045b8ea57e8ca6f9ebd7d68a19486736b7e2809
Signed-off-by: Reka Norman <rekanorman(a)google.com>
---
M src/drivers/intel/pmc_mux/conn/chip.h
M src/drivers/intel/pmc_mux/conn/conn.c
M src/mainboard/google/brya/variants/anahera/overridetree.cb
M src/mainboard/google/brya/variants/anahera4es/overridetree.cb
M src/mainboard/google/brya/variants/brask/overridetree.cb
M src/mainboard/google/brya/variants/brya0/overridetree.cb
M src/mainboard/google/brya/variants/brya4es/overridetree.cb
M src/mainboard/google/brya/variants/felwinter/overridetree.cb
M src/mainboard/google/brya/variants/gimble/overridetree.cb
M src/mainboard/google/brya/variants/gimble4es/overridetree.cb
M src/mainboard/google/brya/variants/kano/overridetree.cb
M src/mainboard/google/brya/variants/primus/overridetree.cb
M src/mainboard/google/brya/variants/primus4es/overridetree.cb
M src/mainboard/google/brya/variants/redrix/overridetree.cb
M src/mainboard/google/brya/variants/redrix4es/overridetree.cb
M src/mainboard/google/brya/variants/taeko/overridetree.cb
M src/mainboard/google/brya/variants/taeko4es/overridetree.cb
M src/mainboard/google/volteer/variants/chronicler/overridetree.cb
M src/mainboard/google/volteer/variants/collis/overridetree.cb
M src/mainboard/google/volteer/variants/copano/overridetree.cb
M src/mainboard/google/volteer/variants/delbin/overridetree.cb
M src/mainboard/google/volteer/variants/drobit/overridetree.cb
M src/mainboard/google/volteer/variants/eldrid/overridetree.cb
M src/mainboard/google/volteer/variants/elemi/overridetree.cb
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
M src/mainboard/google/volteer/variants/terrador/overridetree.cb
M src/mainboard/google/volteer/variants/todor/overridetree.cb
M src/mainboard/google/volteer/variants/voema/overridetree.cb
M src/mainboard/google/volteer/variants/volet/overridetree.cb
M src/mainboard/google/volteer/variants/volteer/overridetree.cb
M src/mainboard/google/volteer/variants/volteer2/overridetree.cb
M src/mainboard/google/volteer/variants/voxel/overridetree.cb
M src/mainboard/intel/adlrvp/variants/adlrvp_m_ext_ec/overridetree.cb
M src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
M src/mainboard/intel/adlrvp/variants/adlrvp_p_mchp/overridetree.cb
M src/mainboard/intel/shadowmountain/variants/baseboard/devicetree.cb
M src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
M src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
M src/mainboard/system76/darp7/devicetree.cb
M src/mainboard/system76/galp5/devicetree.cb
M src/mainboard/system76/lemp10/devicetree.cb
41 files changed, 168 insertions(+), 168 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/60143/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/60143
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5045b8ea57e8ca6f9ebd7d68a19486736b7e2809
Gerrit-Change-Number: 60143
Gerrit-PatchSet: 2
Gerrit-Owner: Reka Norman <rekanorman(a)chromium.org>
Gerrit-Reviewer: Jeremy Soller <jeremy(a)system76.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Reka Norman <rekanorman(a)google.com>
Gerrit-Reviewer: Tim Crawford <tcrawford(a)system76.com>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Reka Norman <rekanorman(a)google.com>
Gerrit-Attention: Tim Crawford <tcrawford(a)system76.com>
Gerrit-Attention: Jeremy Soller <jeremy(a)system76.com>
Gerrit-Attention: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Tim Crawford, Jeremy Soller, Tim Wawrzynczak, Nick Vaccaro, Patrick Rudolph.
Reka Norman has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/60143 )
Change subject: drivers/intel/pmc_mux/conn: Change usb{23}_port_number fields to device pointers
......................................................................
Patch Set 1:
This change is ready for review.
--
To view, visit https://review.coreboot.org/c/coreboot/+/60143
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5045b8ea57e8ca6f9ebd7d68a19486736b7e2809
Gerrit-Change-Number: 60143
Gerrit-PatchSet: 1
Gerrit-Owner: Reka Norman <rekanorman(a)chromium.org>
Gerrit-Reviewer: Jeremy Soller <jeremy(a)system76.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Tim Crawford <tcrawford(a)system76.com>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Reka Norman <rekanorman(a)google.com>
Gerrit-Attention: Tim Crawford <tcrawford(a)system76.com>
Gerrit-Attention: Jeremy Soller <jeremy(a)system76.com>
Gerrit-Attention: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Comment-Date: Thu, 16 Dec 2021 00:34:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Reka Norman has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60143 )
Change subject: drivers/intel/pmc_mux/conn: Change usb{23}_port_number fields to device pointers
......................................................................
drivers/intel/pmc_mux/conn: Change usb{23}_port_number fields to device pointers
Currently, the pmc_mux/conn driver uses integer fields to store the
USB-2 and USB-3 port numbers from the SoC's point of view. Specifying
these as integers in the devicetree is error-prone, and this
information can instead be represented using pointers to the USB-2 and
USB-3 devices. The port numbers can then be obtained from the paths of
the linked devices, e.g. dev->path.usb.port_id.
Modify the driver to store device pointers instead of integer port
numbers, and update all devicetrees using the driver. These are the
mainboards affected (all are Intel TGL or ADL based):
google/brya
google/volteer
intel/adlrvp
intel/shadowmountain
intel/tglrvp
system76/darp7
system76/galp5
system76/lemp10
Command used to update the devicetrees:
git grep -l "usb._port_number" src/mainboard/ | \
xargs sed -i \
-e 's/register "usb2_port_number" = "\(.*\)"/use usb2_port\1 as usb2_port/g' \
-e 's/register "usb3_port_number" = "\(.*\)"/use tcss_usb3_port\1 as usb3_port/g'
BUG=b:208502191
TEST=Build test all affected boards. On brya0, boot device and check
that the ACPI tables generated with and without the change are the same.
Change-Id: I5045b8ea57e8ca6f9ebd7d68a19486736b7e2809
---
M src/drivers/intel/pmc_mux/conn/chip.h
M src/drivers/intel/pmc_mux/conn/conn.c
M src/mainboard/google/brya/variants/anahera/overridetree.cb
M src/mainboard/google/brya/variants/anahera4es/overridetree.cb
M src/mainboard/google/brya/variants/brask/overridetree.cb
M src/mainboard/google/brya/variants/brya0/overridetree.cb
M src/mainboard/google/brya/variants/brya4es/overridetree.cb
M src/mainboard/google/brya/variants/felwinter/overridetree.cb
M src/mainboard/google/brya/variants/gimble/overridetree.cb
M src/mainboard/google/brya/variants/gimble4es/overridetree.cb
M src/mainboard/google/brya/variants/kano/overridetree.cb
M src/mainboard/google/brya/variants/primus/overridetree.cb
M src/mainboard/google/brya/variants/primus4es/overridetree.cb
M src/mainboard/google/brya/variants/redrix/overridetree.cb
M src/mainboard/google/brya/variants/redrix4es/overridetree.cb
M src/mainboard/google/brya/variants/taeko/overridetree.cb
M src/mainboard/google/brya/variants/taeko4es/overridetree.cb
M src/mainboard/google/volteer/variants/chronicler/overridetree.cb
M src/mainboard/google/volteer/variants/collis/overridetree.cb
M src/mainboard/google/volteer/variants/copano/overridetree.cb
M src/mainboard/google/volteer/variants/delbin/overridetree.cb
M src/mainboard/google/volteer/variants/drobit/overridetree.cb
M src/mainboard/google/volteer/variants/eldrid/overridetree.cb
M src/mainboard/google/volteer/variants/elemi/overridetree.cb
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
M src/mainboard/google/volteer/variants/terrador/overridetree.cb
M src/mainboard/google/volteer/variants/todor/overridetree.cb
M src/mainboard/google/volteer/variants/voema/overridetree.cb
M src/mainboard/google/volteer/variants/volet/overridetree.cb
M src/mainboard/google/volteer/variants/volteer/overridetree.cb
M src/mainboard/google/volteer/variants/volteer2/overridetree.cb
M src/mainboard/google/volteer/variants/voxel/overridetree.cb
M src/mainboard/intel/adlrvp/variants/adlrvp_m_ext_ec/overridetree.cb
M src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
M src/mainboard/intel/adlrvp/variants/adlrvp_p_mchp/overridetree.cb
M src/mainboard/intel/shadowmountain/variants/baseboard/devicetree.cb
M src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
M src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
M src/mainboard/system76/darp7/devicetree.cb
M src/mainboard/system76/galp5/devicetree.cb
M src/mainboard/system76/lemp10/devicetree.cb
41 files changed, 168 insertions(+), 168 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/60143/1
diff --git a/src/drivers/intel/pmc_mux/conn/chip.h b/src/drivers/intel/pmc_mux/conn/chip.h
index 96347ae..9633776 100644
--- a/src/drivers/intel/pmc_mux/conn/chip.h
+++ b/src/drivers/intel/pmc_mux/conn/chip.h
@@ -6,10 +6,10 @@
#include <boot/coreboot_tables.h>
struct drivers_intel_pmc_mux_conn_config {
- /* 1-based port numbers (from SoC point of view) */
- int usb2_port_number;
- /* 1-based port numbers (from SoC point of view) */
- int usb3_port_number;
+ /* A pointer to the SoC's USB-2 device. */
+ DEVTREE_CONST struct device *usb2_port;
+ /* A pointer to the SoC's USB-3 device. */
+ DEVTREE_CONST struct device *usb3_port;
/* Orientation of the sideband signals (SBU) */
enum type_c_orientation sbu_orientation;
/* Orientation of the High Speed lines */
diff --git a/src/drivers/intel/pmc_mux/conn/conn.c b/src/drivers/intel/pmc_mux/conn/conn.c
index caff166..700ee0e 100644
--- a/src/drivers/intel/pmc_mux/conn/conn.c
+++ b/src/drivers/intel/pmc_mux/conn/conn.c
@@ -57,8 +57,8 @@
count = info->port_count;
port_info = &info->port_info[count];
- port_info->usb2_port_number = config->usb2_port_number;
- port_info->usb3_port_number = config->usb3_port_number;
+ port_info->usb2_port_number = config->usb2_port->path.usb.port_id + 1;
+ port_info->usb3_port_number = config->usb3_port->path.usb.port_id + 1;
port_info->sbu_orientation = config->sbu_orientation;
port_info->data_orientation = config->hsl_orientation;
@@ -109,8 +109,8 @@
/* _DSD, Device-Specific Data */
dsd = acpi_dp_new_table("_DSD");
- acpi_dp_add_integer(dsd, "usb2-port-number", config->usb2_port_number);
- acpi_dp_add_integer(dsd, "usb3-port-number", config->usb3_port_number);
+ acpi_dp_add_integer(dsd, "usb2-port-number", config->usb2_port->path.usb.port_id + 1);
+ acpi_dp_add_integer(dsd, "usb3-port-number", config->usb3_port->path.usb.port_id + 1);
/*
* The kernel assumes that these Type-C signals (SBUs and HSLs) follow the CC lines,
@@ -161,8 +161,8 @@
return false;
mux_config = conn->chip_info;
- *usb2_port = mux_config->usb2_port_number;
- *usb3_port = mux_config->usb3_port_number;
+ *usb2_port = mux_config->usb2_port->path.usb.port_id + 1;
+ *usb3_port = mux_config->usb3_port->path.usb.port_id + 1;
return true;
};
diff --git a/src/mainboard/google/brya/variants/anahera/overridetree.cb b/src/mainboard/google/brya/variants/anahera/overridetree.cb
index dc563a4..cee883e 100644
--- a/src/mainboard/google/brya/variants/anahera/overridetree.cb
+++ b/src/mainboard/google/brya/variants/anahera/overridetree.cb
@@ -280,13 +280,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/anahera4es/overridetree.cb b/src/mainboard/google/brya/variants/anahera4es/overridetree.cb
index dc563a4..cee883e 100644
--- a/src/mainboard/google/brya/variants/anahera4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/anahera4es/overridetree.cb
@@ -280,13 +280,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/brask/overridetree.cb b/src/mainboard/google/brya/variants/brask/overridetree.cb
index 258898d..cc31bd1 100644
--- a/src/mainboard/google/brya/variants/brask/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brask/overridetree.cb
@@ -173,18 +173,18 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
device generic 1 alias conn1 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 2 alias conn2 on end
end
end
diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
index 3822a2c..cae2257 100644
--- a/src/mainboard/google/brya/variants/brya0/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb
@@ -626,18 +626,18 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
device generic 1 alias conn1 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 2 alias conn2 on end
end
end
diff --git a/src/mainboard/google/brya/variants/brya4es/overridetree.cb b/src/mainboard/google/brya/variants/brya4es/overridetree.cb
index 6812f20..1b34afb 100644
--- a/src/mainboard/google/brya/variants/brya4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya4es/overridetree.cb
@@ -625,18 +625,18 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
device generic 1 alias conn1 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 2 alias conn2 on end
end
end
diff --git a/src/mainboard/google/brya/variants/felwinter/overridetree.cb b/src/mainboard/google/brya/variants/felwinter/overridetree.cb
index dafdbfc..46e7b9a 100644
--- a/src/mainboard/google/brya/variants/felwinter/overridetree.cb
+++ b/src/mainboard/google/brya/variants/felwinter/overridetree.cb
@@ -302,13 +302,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 2 alias conn2 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/gimble/overridetree.cb b/src/mainboard/google/brya/variants/gimble/overridetree.cb
index 4bfe124..7ed2348 100644
--- a/src/mainboard/google/brya/variants/gimble/overridetree.cb
+++ b/src/mainboard/google/brya/variants/gimble/overridetree.cb
@@ -253,13 +253,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "3"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/gimble4es/overridetree.cb b/src/mainboard/google/brya/variants/gimble4es/overridetree.cb
index 8b6daf2..1b0d791 100644
--- a/src/mainboard/google/brya/variants/gimble4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/gimble4es/overridetree.cb
@@ -215,13 +215,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "3"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/kano/overridetree.cb b/src/mainboard/google/brya/variants/kano/overridetree.cb
index a908a7b..d4d2b58 100644
--- a/src/mainboard/google/brya/variants/kano/overridetree.cb
+++ b/src/mainboard/google/brya/variants/kano/overridetree.cb
@@ -486,13 +486,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/primus/overridetree.cb b/src/mainboard/google/brya/variants/primus/overridetree.cb
index ef5ad98..6fe5dda 100644
--- a/src/mainboard/google/brya/variants/primus/overridetree.cb
+++ b/src/mainboard/google/brya/variants/primus/overridetree.cb
@@ -298,13 +298,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/primus4es/overridetree.cb b/src/mainboard/google/brya/variants/primus4es/overridetree.cb
index ce06d30..51824b5 100644
--- a/src/mainboard/google/brya/variants/primus4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/primus4es/overridetree.cb
@@ -292,13 +292,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/redrix/overridetree.cb b/src/mainboard/google/brya/variants/redrix/overridetree.cb
index 617ebc5..50433f5 100644
--- a/src/mainboard/google/brya/variants/redrix/overridetree.cb
+++ b/src/mainboard/google/brya/variants/redrix/overridetree.cb
@@ -435,13 +435,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
index 67cb7f3..4ace6f3 100644
--- a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
@@ -437,13 +437,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/taeko/overridetree.cb b/src/mainboard/google/brya/variants/taeko/overridetree.cb
index d485662..5e12f32 100644
--- a/src/mainboard/google/brya/variants/taeko/overridetree.cb
+++ b/src/mainboard/google/brya/variants/taeko/overridetree.cb
@@ -419,13 +419,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 2 alias conn1 on end
end
end
diff --git a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
index d485662..5e12f32 100644
--- a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
@@ -419,13 +419,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
device generic 2 alias conn1 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/chronicler/overridetree.cb b/src/mainboard/google/volteer/variants/chronicler/overridetree.cb
index 4b9f095..93ed52b 100644
--- a/src/mainboard/google/volteer/variants/chronicler/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/chronicler/overridetree.cb
@@ -264,14 +264,14 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/collis/overridetree.cb b/src/mainboard/google/volteer/variants/collis/overridetree.cb
index 2fe5001..3323bdf 100644
--- a/src/mainboard/google/volteer/variants/collis/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/collis/overridetree.cb
@@ -205,15 +205,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "5"
- register "usb3_port_number" = "1"
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "2"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/copano/overridetree.cb b/src/mainboard/google/volteer/variants/copano/overridetree.cb
index 6ea6fd58..7ffa7ab 100644
--- a/src/mainboard/google/volteer/variants/copano/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/copano/overridetree.cb
@@ -230,15 +230,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "5"
- register "usb3_port_number" = "1"
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "2"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/delbin/overridetree.cb b/src/mainboard/google/volteer/variants/delbin/overridetree.cb
index a36ad1a..378d4e2 100644
--- a/src/mainboard/google/volteer/variants/delbin/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/delbin/overridetree.cb
@@ -211,15 +211,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/drobit/overridetree.cb b/src/mainboard/google/volteer/variants/drobit/overridetree.cb
index 14a5ecf..a31017e 100644
--- a/src/mainboard/google/volteer/variants/drobit/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/drobit/overridetree.cb
@@ -209,15 +209,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/eldrid/overridetree.cb b/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
index f357f0d..9354418 100644
--- a/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
@@ -211,14 +211,14 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/elemi/overridetree.cb b/src/mainboard/google/volteer/variants/elemi/overridetree.cb
index 9ce349b..22230ab 100644
--- a/src/mainboard/google/volteer/variants/elemi/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/elemi/overridetree.cb
@@ -281,14 +281,14 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
index 9dfd56c..2eb482d 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -289,14 +289,14 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follows CC
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/terrador/overridetree.cb b/src/mainboard/google/volteer/variants/terrador/overridetree.cb
index 53b0c42..6d29818 100644
--- a/src/mainboard/google/volteer/variants/terrador/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/terrador/overridetree.cb
@@ -158,15 +158,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "5"
- register "usb3_port_number" = "1"
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "2"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/todor/overridetree.cb b/src/mainboard/google/volteer/variants/todor/overridetree.cb
index ece746b..eb61053 100644
--- a/src/mainboard/google/volteer/variants/todor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/todor/overridetree.cb
@@ -147,15 +147,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "5"
- register "usb3_port_number" = "1"
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "2"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/voema/overridetree.cb b/src/mainboard/google/volteer/variants/voema/overridetree.cb
index 082dfdf..8fdc067 100644
--- a/src/mainboard/google/volteer/variants/voema/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voema/overridetree.cb
@@ -115,13 +115,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "5"
- register "usb3_port_number" = "1"
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "2"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/volet/overridetree.cb b/src/mainboard/google/volteer/variants/volet/overridetree.cb
index 1d11063..f4e2255 100644
--- a/src/mainboard/google/volteer/variants/volet/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volet/overridetree.cb
@@ -152,13 +152,13 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
index f3b7549..9375af3 100644
--- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
@@ -221,14 +221,14 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
index 7fe38a9..d024835 100644
--- a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
@@ -288,14 +288,14 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
device generic 1 alias conn1 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index 2efc3ed..4bca103 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -244,15 +244,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "9"
- register "usb3_port_number" = "1"
+ use usb2_port9 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_m_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_m_ext_ec/overridetree.cb
index 133a737..a3860c6 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_m_ext_ec/overridetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_m_ext_ec/overridetree.cb
@@ -14,15 +14,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
index e78d00f..de5471c 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
@@ -34,22 +34,22 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "3"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port3 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 2 alias conn2 on end
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_mchp/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_mchp/overridetree.cb
index a23db8c..91073f7 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p_mchp/overridetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p_mchp/overridetree.cb
@@ -14,15 +14,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "1"
- register "usb3_port_number" = "1"
+ use usb2_port1 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "2"
- register "usb3_port_number" = "2"
+ use usb2_port2 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/intel/shadowmountain/variants/baseboard/devicetree.cb b/src/mainboard/intel/shadowmountain/variants/baseboard/devicetree.cb
index 6cf83d2..5757392 100644
--- a/src/mainboard/intel/shadowmountain/variants/baseboard/devicetree.cb
+++ b/src/mainboard/intel/shadowmountain/variants/baseboard/devicetree.cb
@@ -279,15 +279,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "6"
- register "usb3_port_number" = "1"
+ use usb2_port6 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "4"
- register "usb3_port_number" = "2"
+ use usb2_port4 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
index b84fddc..2d990de 100644
--- a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
+++ b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
@@ -323,15 +323,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "6"
- register "usb3_port_number" = "3"
+ use usb2_port6 as usb2_port
+ use tcss_usb3_port3 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "7"
- register "usb3_port_number" = "4"
+ use usb2_port7 as usb2_port
+ use tcss_usb3_port4 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb b/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
index fcadcee..dae353c 100644
--- a/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
+++ b/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
@@ -327,15 +327,15 @@
chip drivers/intel/pmc_mux
device generic 0 on
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "6"
- register "usb3_port_number" = "3"
+ use usb2_port6 as usb2_port
+ use tcss_usb3_port3 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
- register "usb2_port_number" = "5"
- register "usb3_port_number" = "2"
+ use usb2_port5 as usb2_port
+ use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end
diff --git a/src/mainboard/system76/darp7/devicetree.cb b/src/mainboard/system76/darp7/devicetree.cb
index 8c16d2a..80c2a84 100644
--- a/src/mainboard/system76/darp7/devicetree.cb
+++ b/src/mainboard/system76/darp7/devicetree.cb
@@ -318,8 +318,8 @@
device generic 0 on
chip drivers/intel/pmc_mux/conn
# J_TYPEC2
- register "usb2_port_number" = "6"
- register "usb3_port_number" = "1"
+ use usb2_port6 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
diff --git a/src/mainboard/system76/galp5/devicetree.cb b/src/mainboard/system76/galp5/devicetree.cb
index b0fa524..06b23ab 100644
--- a/src/mainboard/system76/galp5/devicetree.cb
+++ b/src/mainboard/system76/galp5/devicetree.cb
@@ -322,8 +322,8 @@
device generic 0 on
chip drivers/intel/pmc_mux/conn
# J_TYPEC2
- register "usb2_port_number" = "6"
- register "usb3_port_number" = "1"
+ use usb2_port6 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
diff --git a/src/mainboard/system76/lemp10/devicetree.cb b/src/mainboard/system76/lemp10/devicetree.cb
index 5c702b9..7517db7 100644
--- a/src/mainboard/system76/lemp10/devicetree.cb
+++ b/src/mainboard/system76/lemp10/devicetree.cb
@@ -283,8 +283,8 @@
device generic 0 on
chip drivers/intel/pmc_mux/conn
# J_TYPEC1
- register "usb2_port_number" = "3"
- register "usb3_port_number" = "1"
+ use usb2_port3 as usb2_port
+ use tcss_usb3_port1 as usb3_port
# SBU & HSL follow CC
device generic 0 alias conn0 on end
end
--
To view, visit https://review.coreboot.org/c/coreboot/+/60143
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5045b8ea57e8ca6f9ebd7d68a19486736b7e2809
Gerrit-Change-Number: 60143
Gerrit-PatchSet: 1
Gerrit-Owner: Reka Norman <rekanorman(a)chromium.org>
Gerrit-CC: Reka Norman <rekanorman(a)google.com>
Gerrit-MessageType: newchange
Attention is currently required from: Jakub Czapiga, Paul Menzel.
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/59497 )
Change subject: libpayload: Implement new CBFS access API
......................................................................
Patch Set 8:
(7 comments)
File payloads/libpayload/Kconfig:
https://review.coreboot.org/c/coreboot/+/59497/comment/69b26097_da731833
PS8, Line 211: config CBFS
nit: maybe makes sense to just move this into libcbfs/Kconfig as well now?
File payloads/libpayload/include/cbfs_core.h:
https://review.coreboot.org/c/coreboot/+/59497/comment/176a30df_ad135bb3
PS5, Line 87: #define CBFS_ATTRIBUTE_ALIGN 4
> Done
You're still adding METADATA_MAX_SIZE and a _Static_assert() to cbfs_core.h which I don't think are really necessary there.
File payloads/libpayload/include/cbfs_glue.h:
https://review.coreboot.org/c/coreboot/+/59497/comment/f18839ed_1feafde2
PS3, Line 38: {
> Oh right, thanks for paying attention!
This, too, this is still open. (Also, I don't know how that second comment slipped in there... I wrote that one first, then I looked at it more closely, and then I wrote the first comment about why this is was bad idea. The second comment must have survived in some other open Gerrit tab and slipped in later or something. Anyway, removing dev->offset from that check is the correct way.)
File payloads/libpayload/libcbfs/Kconfig:
https://review.coreboot.org/c/coreboot/+/59497/comment/903331b9_e0b3eafe
PS8, Line 16: RO (COREBOOT) region if it isn't available in the active RW region.
This should mention that this only makes sense if CONFIG_VBOOT is enabled in coreboot. (Unfortunately we can't just `depends on VBOOT` here, because with the way vboot works right now it would be reasonable to enable vboot in coreboot but disable it in libpayload.)
File payloads/libpayload/libcbfs/cbfs.c:
https://review.coreboot.org/c/coreboot/+/59497/comment/a1624e37_4c119cc2
PS3, Line 60: void cbfs_boot_device_find_mcache(struct cbfs_boot_device *cbd, bool is_ro);
> Hmm, well... […]
Sorry, I should have unresolved this, it kinda slipped through now.
File payloads/libpayload/libcbfs/cbfs.c:
https://review.coreboot.org/c/coreboot/+/59497/comment/d4ac07d2_ca2aee3e
PS8, Line 111: ERROR("Buffer allocation failed");
nit: would be nice to add mdata->h.filename to all these errors
https://review.coreboot.org/c/coreboot/+/59497/comment/2e0d56b5_18896503
PS8, Line 172: if (!size_inout || *size_inout < out_size)
nit: might want to print an error here too?
--
To view, visit https://review.coreboot.org/c/coreboot/+/59497
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I00da0658dbac0cddf92ad55611def947932d23c7
Gerrit-Change-Number: 59497
Gerrit-PatchSet: 8
Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Julius Werner <jwerner(a)chromium.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com>
Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Comment-Date: Wed, 15 Dec 2021 23:50:00 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Jakub Czapiga <jacz(a)semihalf.com>
Comment-In-Reply-To: Julius Werner <jwerner(a)chromium.org>
Gerrit-MessageType: comment
Attention is currently required from: Jakub Czapiga, Jan Dabros, Yu-Ping Wu.
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/60080 )
Change subject: libpayload: Enable vboot integration
......................................................................
Patch Set 3:
(1 comment)
File payloads/libpayload/vboot/Kconfig:
https://review.coreboot.org/c/coreboot/+/60080/comment/f897e141_8ad60f1a
PS3, Line 5: config VBOOT
Actually, on second thought maybe it would be better to call this CONFIG_VBOOT_LIB and make the text something like "Compile verified boot (vboot) library", since that's the name of the coreboot option which is closer to what this actually does. Turning this on doesn't really enable boot verification in any way (coreboot does that by actually verifying the RW section and then passing it through lib_sysinfo), it just makes the library functions available for things like crypto support.
--
To view, visit https://review.coreboot.org/c/coreboot/+/60080
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2d9d766a461edaa0081041c020ecf580fd2ca64e
Gerrit-Change-Number: 60080
Gerrit-PatchSet: 3
Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com>
Gerrit-Reviewer: Jan Dabros <jsd(a)semihalf.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com>
Gerrit-Attention: Jan Dabros <jsd(a)semihalf.com>
Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com>
Gerrit-Comment-Date: Wed, 15 Dec 2021 23:47:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Martin Roth, Bao Zheng.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/59337 )
Change subject: RFC: Unify PSP section of cezanne & picasso makefiles
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://review.coreboot.org/c/coreboot/+/59337/comment/5adb78cf_c8d07a0b
PS1, Line 15: Why doesn't Picasso use multilevel?
i think there was just no multi-level support in amdfwtool when the picasso support was initially created and it wasn't added later, so there might have been no particular reason for that. from having a quick look at the documentation i'd say that picasso should support multi level psp/bios tables. haven't really verified this though
--
To view, visit https://review.coreboot.org/c/coreboot/+/59337
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I00a8a3d34afeeee08fdcec52c7fa35c885ffc7a6
Gerrit-Change-Number: 59337
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Bao Zheng <zheng.bao(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Bao Zheng <zheng.bao(a)amd.corp-partner.google.com>
Gerrit-Comment-Date: Wed, 15 Dec 2021 23:31:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment