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, 18 insertions, 51 deletions

diff --git a/zephyr/shim/src/temp_sensors.c b/zephyr/shim/src/temp_sensors.c
index ae3a367252..371d7d7fc9 100644
--- a/zephyr/shim/src/temp_sensors.c
+++ b/zephyr/shim/src/temp_sensors.c
@@ -6,7 +6,6 @@
 #include "adc.h"
 #include "charger/chg_rt9490.h"
 #include "driver/charger/rt9490.h"
-#include "hooks.h"
 #include "temp_sensor.h"
 #include "temp_sensor/pct2075.h"
 #include "temp_sensor/sb_tsi.h"
@@ -80,7 +79,6 @@ static int thermistor_get_temp(const struct temp_sensor_t *sensor,
 		.read = &thermistor_get_temp,                  \
 		.thermistor = GET_THERMISTOR_INFO(             \
 			DT_PHANDLE(sensor_id, thermistor)),    \
-		.update_temperature = NULL,                    \
 		FILL_POWER_GOOD(named_id) })
 
 #define TEMP_THERMISTOR(named_id, sensor_id)                                 \
@@ -112,12 +110,10 @@ __maybe_unused static int pct2075_get_temp(const struct temp_sensor_t *sensor,
 			(DT_REG_ADDR(node_id) | I2C_FLAG_BIG_ENDIAN), \
 	},
 
-#define GET_ZEPHYR_TEMP_SENSOR_PCT2075(named_id)                  \
-	(&(const struct zephyr_temp_sensor){                      \
-		.read = &pct2075_get_temp,                        \
-		.thermistor = NULL,                               \
-		.update_temperature = pct2075_update_temperature, \
-		FILL_POWER_GOOD(named_id) })
+#define GET_ZEPHYR_TEMP_SENSOR_PCT2075(named_id)                        \
+	(&(const struct zephyr_temp_sensor){ .read = &pct2075_get_temp, \
+					     .thermistor = NULL,        \
+					     FILL_POWER_GOOD(named_id) })
 
 #define TEMP_PCT2075(named_id, sensor_id)                                \
 	[TEMP_SENSOR_ID(named_id)] = {                                   \
@@ -148,10 +144,9 @@ __maybe_unused static int sb_tsi_get_temp(const struct temp_sensor_t *sensor,
 
 #endif /* SB_TSI_COMPAT */
 
-#define GET_ZEPHYR_TEMP_SENSOR_SB_TSI(named_id)                          \
-	(&(const struct zephyr_temp_sensor){ .read = &sb_tsi_get_temp,   \
-					     .thermistor = NULL,         \
-					     .update_temperature = NULL, \
+#define GET_ZEPHYR_TEMP_SENSOR_SB_TSI(named_id)                        \
+	(&(const struct zephyr_temp_sensor){ .read = &sb_tsi_get_temp, \
+					     .thermistor = NULL,       \
 					     FILL_POWER_GOOD(named_id) })
 
 #define TEMP_SB_TSI(named_id, sensor_id)                                \
@@ -179,12 +174,10 @@ __maybe_unused static int tmp112_get_temp(const struct temp_sensor_t *sensor,
 		.i2c_addr_flags = DT_REG_ADDR(node_id), \
 	},
 
-#define GET_ZEPHYR_TEMP_SENSOR_TMP112(named_id)                  \
-	(&(const struct zephyr_temp_sensor){                     \
-		.read = &tmp112_get_temp,                        \
-		.thermistor = NULL,                              \
-		.update_temperature = tmp112_update_temperature, \
-		FILL_POWER_GOOD(named_id) })
+#define GET_ZEPHYR_TEMP_SENSOR_TMP112(named_id)                        \
+	(&(const struct zephyr_temp_sensor){ .read = &tmp112_get_temp, \
+					     .thermistor = NULL,       \
+					     FILL_POWER_GOOD(named_id) })
 
 #define TEMP_TMP112(named_id, sensor_id)                                \
 	[TEMP_SENSOR_ID(named_id)] = {                                  \
@@ -211,7 +204,6 @@ const struct tmp112_sensor_t tmp112_sensors[TMP112_COUNT] = {
 		.read = &rt9490_get_thermistor_val,         \
 		.thermistor = GET_THERMISTOR_INFO(          \
 			DT_PHANDLE(sensor_id, thermistor)), \
-		.update_temperature = NULL,                 \
 		FILL_POWER_GOOD(named_id) })
 
 #define TEMP_RT9490(named_id, sensor_id) \
@@ -243,20 +235,6 @@ const struct tmp112_sensor_t tmp112_sensors[TMP112_COUNT] = {
 const struct temp_sensor_t temp_sensors[] = { DT_FOREACH_CHILD_SEP(
 	TEMP_SENSORS_NODEID, TEMP_SENSOR_ENTRY, (, )) };
 
-BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
-
-static bool temp_sensor_check_power(const struct temp_sensor_t *sensor)
-{
-#if ANY_INST_HAS_POWER_GOOD_PIN
-	if (sensor->zephyr_info->power_good_dev) {
-		if (!gpio_pin_get(sensor->zephyr_info->power_good_dev,
-				  sensor->zephyr_info->power_good_pin))
-			return false;
-	}
-#endif
-	return true;
-}
-
 int temp_sensor_read(enum temp_sensor_id id, int *temp_ptr)
 {
 	const struct temp_sensor_t *sensor;
@@ -265,26 +243,15 @@ int temp_sensor_read(enum temp_sensor_id id, int *temp_ptr)
 		return EC_ERROR_INVAL;
 	sensor = temp_sensors + id;
 
-	if (!temp_sensor_check_power(sensor))
-		return EC_ERROR_NOT_POWERED;
+#if ANY_INST_HAS_POWER_GOOD_PIN
+	if (sensor->zephyr_info->power_good_dev) {
+		if (!gpio_pin_get(sensor->zephyr_info->power_good_dev,
+				  sensor->zephyr_info->power_good_pin))
+			return EC_ERROR_NOT_POWERED;
+	}
+#endif
 
 	return sensor->zephyr_info->read(sensor, temp_ptr);
 }
 
-void temp_sensors_update(void)
-{
-	for (int i = 0; i < TEMP_SENSOR_COUNT; i++) {
-		const struct temp_sensor_t *sensor = temp_sensors + i;
-
-		if (!sensor->zephyr_info->update_temperature)
-			continue;
-
-		if (!temp_sensor_check_power(sensor))
-			continue;
-
-		sensor->zephyr_info->update_temperature(sensor->idx);
-	}
-}
-DECLARE_HOOK(HOOK_SECOND, temp_sensors_update, HOOK_PRIO_TEMP_SENSOR);
-
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(TEMP_SENSORS_COMPAT) */