summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-07-06 09:23:20 +0200
committerNico Huber <nico.h@gmx.de>2020-07-06 09:35:52 +0000
commit8008c530e77d7dfbf656cc85ffa9d76491c15f1e (patch)
tree2e5dd72eb4769e17ce22477f92a63756ce47c086 /src/mainboard
parent698647a8c0195e7920b6bf6614c81a3085af7a38 (diff)
downloadcoreboot-8008c530e77d7dfbf656cc85ffa9d76491c15f1e.tar.xz
mb/google/volteer: Rename remaining pmc_mux/con to conn
CB:43090 renamed con to conn to avoid issues when building on Windows. CB:42905 introduced more uses of the old name. Adapt the latter to comply with the former. Change-Id: I723141add5452fc541f67cb8591793f2d64cc231 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43141 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Felix Singer <felixsinger@posteo.net> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Christian Walter <christian.walter@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/volteer/variants/volteer/overridetree.cb2
-rw-r--r--src/mainboard/google/volteer/variants/voxel/overridetree.cb4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
index 577f7c8e84..404b25764a 100644
--- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
@@ -163,7 +163,7 @@ chip soc/intel/tigerlake
probe DB_USB USB3_NO_A
end
end
- chip drivers/intel/pmc_mux/con
+ chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU & HSL follow CC
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index 9ee7e6a346..2219de0e38 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -111,14 +111,14 @@ chip soc/intel/tigerlake
# PMC.MUX device in the ACPI hierarchy.
chip drivers/intel/pmc_mux
device generic 0 on
- chip drivers/intel/pmc_mux/con
+ chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "9"
register "usb3_port_number" = "1"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
end
- chip drivers/intel/pmc_mux/con
+ chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC