diff options
| author | matt_wang <matt_wang@compal.corp-partner.google.com> | 2023-01-09 17:00:02 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-31 04:58:00 +0000 |
| commit | f22f03e698fb89988c7b576a9d794cf04fdd2393 (patch) | |
| tree | 24a227d6bc4643908710b40e3077f7aaf59c2706 | |
| parent | 3bc906f4a74aca8f3edbb336582d7c8a9de26d3e (diff) | |
| download | chrome-ec-f22f03e698fb89988c7b576a9d794cf04fdd2393.tar.gz | |
markarth: modify thermal sensor
Markarth change the thermal sensor from PCT2075 to F75303.
LOW_COVERAGE_REASON=no unit tests for Markarth yet, b/247151116
BUG=b:262409595
BRANCH=none
TEST=zmake build markarth success
Change-Id: I6fd0bb506d1daa78b2f729f62d96c09375583ceb
Signed-off-by: matt_wang <matt_wang@compal.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4145105
Reviewed-by: Diana Z <dzigterman@chromium.org>
| -rw-r--r-- | zephyr/program/skyrim/markarth/project.overlay | 27 | ||||
| -rw-r--r-- | zephyr/program/skyrim/src/stt.c | 11 |
2 files changed, 34 insertions, 4 deletions
diff --git a/zephyr/program/skyrim/markarth/project.overlay b/zephyr/program/skyrim/markarth/project.overlay index d59c9712df..4f4ce9fd7a 100644 --- a/zephyr/program/skyrim/markarth/project.overlay +++ b/zephyr/program/skyrim/markarth/project.overlay @@ -49,7 +49,7 @@ named-temp-sensors { compatible = "cros-ec,temp-sensors"; - soc-pct2075 { + soc-f75303 { temp_host_high = <100>; temp_host_halt = <105>; temp_host_release_high = <80>; @@ -57,11 +57,11 @@ temp_fan_off = <35>; temp_fan_max = <70>; power-good-pin = <&gpio_pg_pwr_s5>; - sensor = <&soc_pct2075>; + sensor = <&soc_f75303>; }; - amb-pct2075 { + amb-f75303 { power-good-pin = <&gpio_pg_pwr_s5>; - sensor = <&amb_pct2075>; + sensor = <&amb_f75303>; }; }; @@ -184,3 +184,22 @@ &usbc_port1 { /delete-property/ bc12; }; + +&i2c6_1 { + /delete-node/ soc-pct2075@48; + /delete-node/ amb-pct2075@4f; + soc_f75303: soc-f75303@48 { + compatible = "cros-ec,temp-sensor-f75303"; + reg = <0x48>; + }; + + amb_f75303: amb-f75303@4f { + compatible = "cros-ec,temp-sensor-f75303"; + reg = <0x4f>; + }; +}; + +&i2c_sensor { + /delete-node/ enum-names; + enum-names = "I2C_PORT_THERMAL"; +};
\ No newline at end of file diff --git a/zephyr/program/skyrim/src/stt.c b/zephyr/program/skyrim/src/stt.c index 40743fbc68..e6a87c8d9f 100644 --- a/zephyr/program/skyrim/src/stt.c +++ b/zephyr/program/skyrim/src/stt.c @@ -6,6 +6,7 @@ /* Support code for STT temperature reporting */ #include "chipset.h" +#include "driver/temp_sensor/f75303.h" #include "temp_sensor/pct2075.h" #include "temp_sensor/temp_sensor.h" @@ -14,8 +15,13 @@ int board_get_soc_temp_mk(int *temp_mk) if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) return EC_ERROR_NOT_POWERED; +#ifdef CONFIG_TEMP_SENSOR_PCT2075 return pct2075_get_val_mk(PCT2075_SENSOR_ID(DT_NODELABEL(soc_pct2075)), temp_mk); +#else + return f75303_get_val_mk(F75303_SENSOR_ID(DT_NODELABEL(soc_f75303)), + temp_mk); +#endif } int board_get_ambient_temp_mk(int *temp_mk) @@ -23,6 +29,11 @@ int board_get_ambient_temp_mk(int *temp_mk) if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) return EC_ERROR_NOT_POWERED; +#ifdef CONFIG_TEMP_SENSOR_PCT2075 return pct2075_get_val_mk(PCT2075_SENSOR_ID(DT_NODELABEL(amb_pct2075)), temp_mk); +#else + return f75303_get_val_mk(F75303_SENSOR_ID(DT_NODELABEL(amb_f75303)), + temp_mk); +#endif } |