Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main

This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.

Reason for revert: broken build due to ec-utils.

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>

Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>

1 files changed, 0 insertions, 148 deletions

diff --git a/board/marasov/vif_override.xml b/board/marasov/vif_override.xml
deleted file mode 100644
index 6ade5d2f92..0000000000
--- a/board/marasov/vif_override.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vif:VIF xmlns="http://usb.org/VendorInfoFile.xsd">
-  <vif:Product_Revision>2</vif:Product_Revision>
-  <vif:TID>0</vif:TID>
-  <vif:Product>
-    <vif:USB4_Num_Internal_Host_Controllers value="1" />
-    <vif:USB4_Num_PCIe_DN_Bridges value="0" />
-    <vif:USB4RouterList>
-      <vif:Usb4Router>
-        <!--USB4 Router 0-->
-        <vif:USB4_Router_ID value="0" />
-        <vif:USB4_Silicon_VID value="32903">8087</vif:USB4_Silicon_VID>
-        <vif:USB4_Num_Lane_Adapters value="4" />
-        <vif:USB4_Num_USB3_DN_Adapters value="1" />
-        <vif:USB4_Num_DP_IN_Adapters value="1" />
-        <vif:USB4_Num_DP_OUT_Adapters value="0" />
-        <vif:USB4_Num_PCIe_DN_Adapters value="4" />
-        <vif:USB4_TBT3_Not_Supported value="0">TBT3 Compatible</vif:USB4_TBT3_Not_Supported>
-        <vif:USB4_PCIe_Wake_Supported value="true" />
-        <vif:USB4_USB3_Wake_Supported value="false" />
-        <vif:USB4_Num_Unused_Adapters value="0" />
-        <vif:USB4_TBT3_VID value="32903">8087</vif:USB4_TBT3_VID>
-        <vif:USB4_PCIe_Switch_Vendor_ID value="32902">8086</vif:USB4_PCIe_Switch_Vendor_ID>
-        <vif:USB4_PCIe_Switch_Device_ID value="39451">9A1B</vif:USB4_PCIe_Switch_Device_ID>
-      </vif:Usb4Router>
-    </vif:USB4RouterList>
-  </vif:Product>
-
-  <vif:Component>
-    <vif:USB4_Max_Speed value="1">Gen 3 (40Gb)</vif:USB4_Max_Speed>
-
-    <!--;USB Host-->
-
-    <vif:Host_Speed value="4">USB 3.2 Gen 2x2</vif:Host_Speed>
-    <vif:Host_Contains_Captive_Retimer value="true" />
-    <vif:Host_Truncates_DP_For_tDHPResponse value="false" />
-    <vif:Host_Suspend_Supported value="true" />
-
-    <!--;PD Source-->
-    <!-- will we ever clear USB_Suspend_Supported? -->
-    <vif:USB_Suspend_May_Be_Cleared value="true" />
-
-    <!-- remove FR_Swap_* when we enable CONFIG_USB_PD_FRS -->
-    <!--;Dual Role-->
-    <vif:FR_Swap_Supported_As_Initial_Sink value="true" />
-    <!--;PD Source-->
-    <vif:FR_Swap_Type_C_Current_Capability_As_Initial_Sink value="3">3A @ 5V</vif:FR_Swap_Type_C_Current_Capability_As_Initial_Sink>
-    <vif:SrcPdoList>
-      <vif:SrcPDO>
-        <!--Source PDO 1-->
-        <vif:Src_PD_OCP_OC_Debounce value="50">50 msec</vif:Src_PD_OCP_OC_Debounce>
-        <vif:Src_PD_OCP_OC_Threshold value="360">3600 mA</vif:Src_PD_OCP_OC_Threshold>
-      </vif:SrcPDO>
-    </vif:SrcPdoList>
-
-    <!-- SOP Discover ID -->
-    <vif:Product_Type_UFP_SOP value="2">PDUSB Peripheral</vif:Product_Type_UFP_SOP>
-    <vif:Product_Type_DFP_SOP value="2">PDUSB Host</vif:Product_Type_DFP_SOP>
-
-    <!-- USB4 Port -->
-    <vif:USB4_Lane_0_Adapter value="1" />
-    <vif:USB4_UFP_Supported value="false" />
-    <vif:USB4_DFP_Supported value="true" />
-    <vif:USB4_USB3_Tunneling_Supported value="true" />
-    <vif:USB4_DP_Tunneling_Supported value="true" />
-    <vif:USB4_CL1_State_Supported value="true" />
-    <vif:USB4_CL2_State_Supported value="true" />
-    <vif:USB4_Num_Retimers value="1" />
-    <vif:USB4_DP_Bit_Rate value="3">HBR3</vif:USB4_DP_Bit_Rate>
-    <vif:USB4_Num_DP_Lanes value="4">4 Lanes</vif:USB4_Num_DP_Lanes>
-
-  </vif:Component>
-
-  <vif:Component>
-    <vif:USB4_Supported value="false" />
-
-    <!--;USB Host-->
-    <vif:Host_Speed value="2">USB 3.2 Gen 2x1</vif:Host_Speed>
-    <vif:Host_Contains_Captive_Retimer value="true" />
-    <vif:Host_Truncates_DP_For_tDHPResponse value="false" />
-    <vif:Host_Suspend_Supported value="true" />
-
-    <!--;PD Source-->
-    <!-- will we ever clear USB_Suspend_Supported? -->
-    <vif:USB_Suspend_May_Be_Cleared value="true" />
-
-    <!-- remove FR_Swap_* when we enable CONFIG_USB_PD_FRS -->
-    <!--;Dual Role-->
-    <vif:FR_Swap_Supported_As_Initial_Sink value="true" />
-    <!--;PD Source-->
-    <vif:FR_Swap_Type_C_Current_Capability_As_Initial_Sink value="3">3A @ 5V</vif:FR_Swap_Type_C_Current_Capability_As_Initial_Sink>
-    <vif:SrcPdoList>
-      <vif:SrcPDO>
-        <!--Source PDO 1-->
-        <vif:Src_PD_OCP_OC_Debounce value="50">50 msec</vif:Src_PD_OCP_OC_Debounce>
-        <vif:Src_PD_OCP_OC_Threshold value="360">3600 mA</vif:Src_PD_OCP_OC_Threshold>
-      </vif:SrcPDO>
-    </vif:SrcPdoList>
-
-    <!-- SOP Discover ID -->
-    <vif:Product_Type_UFP_SOP value="3">PSD</vif:Product_Type_UFP_SOP>
-    <vif:Product_Type_DFP_SOP value="2">PDUSB Host</vif:Product_Type_DFP_SOP>
-
-  </vif:Component>
-
-  <vif:Component>
-    <vif:USB4_Max_Speed value="1">Gen 3 (40Gb)</vif:USB4_Max_Speed>
-    <!--;USB Host-->
-    <vif:Host_Speed value="4">USB 3.2 Gen 2x2</vif:Host_Speed>
-    <vif:Host_Contains_Captive_Retimer value="true" />
-    <vif:Host_Truncates_DP_For_tDHPResponse value="false" />
-    <vif:Host_Suspend_Supported value="true" />
-
-    <!--;PD Source-->
-    <!-- will we ever clear USB_Suspend_Supported? -->
-    <vif:USB_Suspend_May_Be_Cleared value="true" />
-
-    <!-- remove FR_Swap_* when we enable CONFIG_USB_PD_FRS -->
-    <!--;Dual Role-->
-    <vif:FR_Swap_Supported_As_Initial_Sink value="true" />
-    <!--;PD Source-->
-    <vif:FR_Swap_Type_C_Current_Capability_As_Initial_Sink value="3">3A @ 5V</vif:FR_Swap_Type_C_Current_Capability_As_Initial_Sink>
-    <vif:SrcPdoList>
-      <vif:SrcPDO>
-        <!--Source PDO 1-->
-        <vif:Src_PD_OCP_OC_Debounce value="50">50 msec</vif:Src_PD_OCP_OC_Debounce>
-        <vif:Src_PD_OCP_OC_Threshold value="360">3600 mA</vif:Src_PD_OCP_OC_Threshold>
-      </vif:SrcPDO>
-    </vif:SrcPdoList>
-
-    <!-- SOP Discover ID -->
-    <vif:Product_Type_UFP_SOP value="2">PDUSB Peripheral</vif:Product_Type_UFP_SOP>
-    <vif:Product_Type_DFP_SOP value="2">PDUSB Host</vif:Product_Type_DFP_SOP>
-
-    <!-- USB4 Port -->
-    <vif:USB4_Lane_0_Adapter value="1" />
-    <vif:USB4_UFP_Supported value="false" />
-    <vif:USB4_DFP_Supported value="true" />
-    <vif:USB4_USB3_Tunneling_Supported value="true" />
-    <vif:USB4_DP_Tunneling_Supported value="true" />
-    <vif:USB4_CL1_State_Supported value="true" />
-    <vif:USB4_CL2_State_Supported value="true" />
-    <vif:USB4_Num_Retimers value="1" />
-    <vif:USB4_DP_Bit_Rate value="3">HBR3</vif:USB4_DP_Bit_Rate>
-    <vif:USB4_Num_DP_Lanes value="4">4 Lanes</vif:USB4_Num_DP_Lanes>
-
-  </vif:Component>
-</vif:VIF>