diff options
| author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:19:30 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:05 +0000 |
| commit | c8af732351cc5c7167f27e8390e26f0556f53a5a (patch) | |
| tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /zephyr/test/drivers/default/src/thermistor.c | |
| parent | af25602b15b22b9ef5821dcba9934311f2157c48 (diff) | |
| download | chrome-ec-factory-brya-14517.B-main.tar.gz | |
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>
Diffstat (limited to 'zephyr/test/drivers/default/src/thermistor.c')
| -rw-r--r-- | zephyr/test/drivers/default/src/thermistor.c | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/zephyr/test/drivers/default/src/thermistor.c b/zephyr/test/drivers/default/src/thermistor.c index edbe7acad5..417b482d99 100644 --- a/zephyr/test/drivers/default/src/thermistor.c +++ b/zephyr/test/drivers/default/src/thermistor.c @@ -3,20 +3,19 @@ * found in the LICENSE file. */ -#include "../driver/temp_sensor/thermistor.h" -#include "common.h" -#include "temp_sensor/temp_sensor.h" -#include "test/drivers/test_state.h" - +#include <zephyr/kernel.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/adc.h> #include <zephyr/drivers/adc/adc_emul.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> -#include <zephyr/kernel.h> -#include <zephyr/ztest.h> - #include <temp_sensor.h> +#include "common.h" +#include "../driver/temp_sensor/thermistor.h" +#include "temp_sensor/temp_sensor.h" +#include "test/drivers/test_state.h" + #define GPIO_PG_EC_DSW_PWROK_PATH DT_PATH(named_gpios, pg_ec_dsw_pwrok) #define GPIO_PG_EC_DSW_PWROK_PORT DT_GPIO_PIN(GPIO_PG_EC_DSW_PWROK_PATH, gpios) @@ -59,10 +58,6 @@ ZTEST_USER(thermistor, test_thermistor_power_pin) sensor_idx++) { const struct temp_sensor_t *sensor = &temp_sensors[sensor_idx]; - /* Skip for sensors that are not thermistors */ - if (sensor->zephyr_info->thermistor == NULL) - continue; - zassert_ok(adc_emul_const_value_set(adc_dev, sensor->idx, A_VALID_VOLTAGE), "adc_emul_value_func_set() failed on %s", @@ -77,10 +72,6 @@ ZTEST_USER(thermistor, test_thermistor_power_pin) sensor_idx++) { const struct temp_sensor_t *sensor = &temp_sensors[sensor_idx]; - /* Skip for sensors that are not thermistors */ - if (sensor->zephyr_info->thermistor == NULL) - continue; - zassert_equal(EC_ERROR_NOT_POWERED, sensor->zephyr_info->read(sensor, &temp), "%s failed", sensor->name); @@ -94,10 +85,6 @@ ZTEST_USER(thermistor, test_thermistor_power_pin) sensor_idx++) { const struct temp_sensor_t *sensor = &temp_sensors[sensor_idx]; - /* Skip for sensors that are not thermistors */ - if (sensor->zephyr_info->thermistor == NULL) - continue; - zassert_equal(EC_SUCCESS, sensor->zephyr_info->read(sensor, &temp), "%s failed", sensor->name); @@ -126,10 +113,6 @@ ZTEST_USER(thermistor, test_thermistor_adc_read_error) sensor_idx++) { const struct temp_sensor_t *sensor = &temp_sensors[sensor_idx]; - /* Skip for sensors that are not thermistors */ - if (sensor->zephyr_info->thermistor == NULL) - continue; - zassert_ok(adc_emul_value_func_set(adc_dev, sensor->idx, adc_error_func, NULL), "adc_emul_value_func_set() failed on %s", @@ -140,10 +123,6 @@ ZTEST_USER(thermistor, test_thermistor_adc_read_error) sensor_idx++) { const struct temp_sensor_t *sensor = &temp_sensors[sensor_idx]; - /* Skip for sensors that are not thermistors */ - if (sensor->zephyr_info->thermistor == NULL) - continue; - zassert_equal(EC_ERROR_UNKNOWN, sensor->zephyr_info->read(sensor, &temp), "%s failed", sensor->name); @@ -286,16 +265,10 @@ ZTEST_USER(thermistor, test_thermistors_adc_temperature_conversion) const static int reference_res_arr[] = { DT_FOREACH_STATUS_OKAY( THERMISTOR_COMPAT, GET_THERMISTOR_REF_RES) }; - for (sensor_idx = 0; sensor_idx < NAMED_TEMP_SENSORS_SIZE; - sensor_idx++) { - /* Skip for sensors that are not thermistors */ - if (temp_sensors[sensor_idx].zephyr_info->thermistor == NULL) - continue; - + for (sensor_idx = 0; sensor_idx < NAMED_TEMP_SENSORS_SIZE; sensor_idx++) do_thermistor_test(&temp_sensors[sensor_idx], reference_mv_arr[sensor_idx], reference_res_arr[sensor_idx]); - } } ZTEST_USER(thermistor, test_device_nodes_enabled) @@ -339,10 +312,6 @@ static void thermistor_cleanup(void *state) for (sensor_idx = 0; sensor_idx < NAMED_TEMP_SENSORS_SIZE; sensor_idx++) { - /* Skip for sensors that are not thermistors */ - if (temp_sensors[sensor_idx].zephyr_info->thermistor == NULL) - continue; - /* Setup ADC to return 27*C (300K) which is reasonable value */ adc_emul_const_value_set( adc_dev, temp_sensors[sensor_idx].idx, |