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

This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.

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

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..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:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>

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

1 files changed, 5 insertions, 41 deletions

diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc
index 082f96ca7f..903cf575c6 100644
--- a/zephyr/Kconfig.usbc
+++ b/zephyr/Kconfig.usbc
@@ -31,54 +31,18 @@ rsource "Kconfig.usb_charger"
 
 if PLATFORM_EC_USBC
 
-config PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT
+config PLATFORM_EC_CHARGER_INPUT_CURRENT
 	int "Charger input current in mA"
 	depends on PLATFORM_EC_CHARGE_MANAGER
 	default 512
 	help
-	  Default input current limit for the board in mA.
+	  This is the default input current for the board in mA.  Many boards
+	  also use this as the least maximum input current during transients.
 
 	  This value should depend on external power adapter, designed charging
 	  voltage, and the maximum power of the running system. For type-C
-	  chargers, this should be set to no more than 512 mA in order to not
-	  brown-out low-current USB charge ports in accordance with USB-PD r3.0
-	  Sec. 7.3.
-
-config PLATFORM_EC_CHARGER_MIN_INPUT_CURRENT_LIMIT
-	int "Minimum charger input current limit in mA"
-	default 0
-	depends on PLATFORM_EC_CHARGE_MANAGER
-	help
-	  Minimum current limit in mA that will ever be set for chargers, even if a
-	  lower limit is requested.
-
-	  If set, this should usually be set to no more than 2.5W divided by the
-	  maximum supported input voltage in order to satisfy USB-PD pSnkStdby
-	  requirements. Higher values may help devices stay alive under low-battery
-	  conditions at the cost of violating standby power limits.
-
-	  Many boards set this to large values, since historically this number was
-	  usually equal to the default current limit. New boards should avoid doing
-	  so if possible, and usually leave this unset: customization of
-	  board_set_charge_limit() should be considered instead if a device sometimes
-	  requires amounts of power in violation of specs, to limit those violations
-	  only to situations where they are necessary.
-
-config PLATFORM_EC_CHARGER_INPUT_CURRENT_DERATE_PCT
-	int "Charger input current derating percentage"
-	default 0
-	depends on PLATFORM_EC_CHARGE_MANAGER
-	help
-	  Setting this to a nonzero value causes actual charger current limits
-	  to be adjusted by the given percentage. For example, setting this to
-	  4 and requesting a current limit of 1000 mA causes the charge manager
-	  to program an actual current limit of 960 mA.
-
-	  This is useful if a charger consistently draws more current than the
-	  programmed limit, or if it is desired to derate for other
-	  safety-related reasons. If a more complex (non-linear) adjustment is
-	  required, boards should override the board_set_charge_limit()
-	  function instead of configuring this option.
+	  chargers, this should be set to 512 mA in order to not brown-out
+	  low-current USB charge ports in accordance with USB-PD r3.0 Sec. 7.3
 
 config PLATFORM_EC_USBC_OCP
 	bool