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>

11 files changed, 19 insertions, 44 deletions

diff --git a/driver/temp_sensor/adt7481.c b/driver/temp_sensor/adt7481.c
index f0aee1506f..0157d64b2d 100644
--- a/driver/temp_sensor/adt7481.c
+++ b/driver/temp_sensor/adt7481.c
@@ -5,12 +5,12 @@
 
 /* ADT7481 temperature sensor module for Chrome EC */
 
-#include "adt7481.h"
 #include "common.h"
 #include "console.h"
+#include "adt7481.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/amd_r19me4070.c b/driver/temp_sensor/amd_r19me4070.c
index 3ee230da09..97868b6945 100644
--- a/driver/temp_sensor/amd_r19me4070.c
+++ b/driver/temp_sensor/amd_r19me4070.c
@@ -5,12 +5,12 @@
 
 /* R19ME4070 temperature sensor module for Chrome EC */
 
-#include "amd_r19me4070.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
 #include "hooks.h"
 #include "i2c.h"
+#include "amd_r19me4070.h"
 #include "power.h"
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
diff --git a/driver/temp_sensor/f75303.c b/driver/temp_sensor/f75303.c
index d83f7bc4a6..e686537c31 100644
--- a/driver/temp_sensor/f75303.c
+++ b/driver/temp_sensor/f75303.c
@@ -6,11 +6,11 @@
 /* F75303 temperature sensor module for Chrome EC */
 
 #include "common.h"
-#include "console.h"
 #include "f75303.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
+#include "console.h"
 
 static int temps[F75303_IDX_COUNT];
 static int8_t fake_temp[F75303_IDX_COUNT] = { -1, -1, -1 };
diff --git a/driver/temp_sensor/g753.c b/driver/temp_sensor/g753.c
index f162cbf846..8d94cac4f8 100644
--- a/driver/temp_sensor/g753.c
+++ b/driver/temp_sensor/g753.c
@@ -9,8 +9,8 @@
 #include "console.h"
 #include "g753.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/g78x.c b/driver/temp_sensor/g78x.c
index 413e2dda8a..82cb2d26e9 100644
--- a/driver/temp_sensor/g78x.c
+++ b/driver/temp_sensor/g78x.c
@@ -9,8 +9,8 @@
 #include "console.h"
 #include "g78x.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/oti502.c b/driver/temp_sensor/oti502.c
index 4564ad9257..2051df89f6 100644
--- a/driver/temp_sensor/oti502.c
+++ b/driver/temp_sensor/oti502.c
@@ -7,9 +7,9 @@
 
 #include "common.h"
 #include "console.h"
-#include "hooks.h"
-#include "i2c.h"
 #include "oti502.h"
+#include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_ambient; /* Ambient is chip temperature*/
diff --git a/driver/temp_sensor/pct2075.c b/driver/temp_sensor/pct2075.c
index 02150ad796..9c7b7190e9 100644
--- a/driver/temp_sensor/pct2075.c
+++ b/driver/temp_sensor/pct2075.c
@@ -7,8 +7,8 @@
 
 #include "common.h"
 #include "console.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "math_util.h"
 #include "temp_sensor/pct2075.h"
 #include "util.h"
@@ -76,7 +76,6 @@ int pct2075_get_val_mk(int idx, int *temp_mk_ptr)
 	return EC_SUCCESS;
 }
 
-#ifndef CONFIG_ZEPHYR
 static void pct2075_poll(void)
 {
 	int s;
@@ -88,18 +87,6 @@ static void pct2075_poll(void)
 	}
 }
 DECLARE_HOOK(HOOK_SECOND, pct2075_poll, HOOK_PRIO_TEMP_SENSOR);
-#else
-void pct2075_update_temperature(int idx)
-{
-	int temp_reg = 0;
-
-	if (idx >= PCT2075_COUNT)
-		return;
-
-	if (get_reg_temp(idx, &temp_reg) == EC_SUCCESS)
-		temp_mk_local[idx] = pct2075_reg_to_mk(temp_reg);
-}
-#endif /* CONFIG_ZEPHYR */
 
 void pct2075_init(void)
 {
diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c
index 267227f6f3..f7f28159aa 100644
--- a/driver/temp_sensor/tmp112.c
+++ b/driver/temp_sensor/tmp112.c
@@ -7,8 +7,8 @@
 
 #include "common.h"
 #include "console.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "math_util.h"
 #include "temp_sensor/tmp112.h"
 #include "util.h"
@@ -92,7 +92,6 @@ int tmp112_get_val_mk(int idx, int *temp_mk_ptr)
 	return EC_SUCCESS;
 }
 
-#ifndef CONFIG_ZEPHYR
 static void tmp112_poll(void)
 {
 	int s;
@@ -104,18 +103,6 @@ static void tmp112_poll(void)
 	}
 }
 DECLARE_HOOK(HOOK_SECOND, tmp112_poll, HOOK_PRIO_TEMP_SENSOR);
-#else
-static void tmp112_update_temperature(int idx)
-{
-	int temp_reg = 0;
-
-	if (idx >= TMP112_COUNT)
-		return;
-
-	if (get_reg_temp(idx, &temp_reg) == EC_SUCCESS)
-		temp_mk_local[idx] = tmp112_reg_to_mk(temp_reg);
-}
-#endif /* CONFIG_ZEPHYR */
 
 void tmp112_init(void)
 {
diff --git a/driver/temp_sensor/tmp411.c b/driver/temp_sensor/tmp411.c
index 4f8a08a181..8a14440671 100644
--- a/driver/temp_sensor/tmp411.c
+++ b/driver/temp_sensor/tmp411.c
@@ -7,10 +7,10 @@
 
 #include "common.h"
 #include "console.h"
+#include "tmp411.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
-#include "tmp411.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/tmp432.c b/driver/temp_sensor/tmp432.c
index 581e33b979..fde6536536 100644
--- a/driver/temp_sensor/tmp432.c
+++ b/driver/temp_sensor/tmp432.c
@@ -7,10 +7,10 @@
 
 #include "common.h"
 #include "console.h"
+#include "tmp432.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
-#include "tmp432.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/tmp468.c b/driver/temp_sensor/tmp468.c
index 3bfaeeedbb..87eb040460 100644
--- a/driver/temp_sensor/tmp468.c
+++ b/driver/temp_sensor/tmp468.c
@@ -7,13 +7,14 @@
 
 #include "common.h"
 #include "console.h"
+#include "tmp432.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
-#include "tmp432.h"
-#include "tmp468.h"
+#include "hooks.h"
 #include "util.h"
 
+#include "tmp468.h"
+
 static int fake_temp[TMP468_CHANNEL_COUNT] = { -1, -1, -1, -1, -1,
 					       -1, -1, -1, -1 };
 static int temp_val[TMP468_CHANNEL_COUNT] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };