From 8008c530e77d7dfbf656cc85ffa9d76491c15f1e Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 6 Jul 2020 09:23:20 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/43141 Reviewed-by: Paul Menzel Reviewed-by: Felix Singer Reviewed-by: Nico Huber Reviewed-by: Arthur Heymans Reviewed-by: Christian Walter Tested-by: build bot (Jenkins) --- src/mainboard/google/volteer/variants/volteer/overridetree.cb | 2 +- src/mainboard/google/volteer/variants/voxel/overridetree.cb | 4 ++-- 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