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, 13 insertions, 22 deletions

diff --git a/docs/low_battery_startup.md b/docs/low_battery_startup.md
index 1f94d4956e..48f9c28f49 100644
--- a/docs/low_battery_startup.md
+++ b/docs/low_battery_startup.md
@@ -77,7 +77,8 @@ analog signaling alone. Via digital communication in the PD protocol, much
 higher power states may be negotiated. However, higher power states also usually
 run at a higher voltage state as well. Any time the voltage level is changing,
 the power sink (the ChromeOS device) must lower its power consumption during the
-transient.
+transient. The standby current level is governed by
+`CONFIG_CHARGER_INPUT_CURRENT`.
 
 PD port partners are capable of both soft and hard resets. Hard resets will
 cause a dead-bus state for a brief interval before PD can renegotiate, from
@@ -168,7 +169,7 @@ is robust enough to support the device during brief intervals of PD negotiation
 without browning out.
 
 ```
-#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
+#define CONFIG_CHARGER_INPUT_CURRENT 512
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1
 ```
 
@@ -205,7 +206,7 @@ the kernel and get to the login screen.
 
 ```
 /* Limit battery impact during PD voltage changes. */
-#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
+#define CONFIG_CHARGER_INPUT_CURRENT 512
 
 /* Distrust the battery SOC measurement a bit. */
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 3
@@ -256,7 +257,7 @@ less. Very briefly drawing current out of the battery does not cause a brownout.
 Example configuration:
 
 ```
-#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
+#define CONFIG_CHARGER_INPUT_CURRENT 512
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 3
 #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 15000
 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 27000
@@ -300,7 +301,7 @@ performing a no-battery boot. Nami is an exemplar.
 Example configuration:
 
 ```
-#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
+#define CONFIG_CHARGER_INPUT_CURRENT 512
 
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC 1
 #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT 15000
@@ -336,27 +337,17 @@ Example configuration:
 
 ## Configuration Option Details
 
-### `CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT`
+### `CONFIG_CHARGER_INPUT_CURRENT`
 
 Required.
 
-The default charger current limit used on startup and for inactive ports. It
-should not be higher than 512 mA unless the device ships with a discrete power
-supply. Raising this term above 512 mA is contrary to USB-PD. It may be lowered
-in order to improve compatibility with marginal BC1.2 chargers.
+The lowest current limit programmed into the charger. This determines both the
+default level used on startup, and the value used during the voltage transients
+in PD negotiation.
 
-### `CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT`
-
-Optional.
-
-If set, charger input current limits will never be set lower than this value.
-Historically most boards used the same value
-as `CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT`, but doing so violates USB-PD standby
-power requirements when voltages greater than 5V are used with the default 512
-mA value. Configuring this option to a nonzero value may be useful if a board
-needs extra headroom (possibly at the cost of drawing excess standby power), but
-boards should prefer to override `board_set_charge_limit()` instead to limit
-situations with excess power draw to only occur when that extra power is needed.
+It should not be higher than 512 mA unless the device ships with a discrete
+power supply. Raising this term above 512 mA is contrary to USB-PD. It may be
+lowered in order to improve compatibility with marginal BC1.2 chargers.
 
 ### `CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON`