diff options
author | Dawid Niedzwiecki <dn@semihalf.com> | 2021-04-20 14:12:36 +0200 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-04-22 01:42:36 +0000 |
commit | 97f1427e200b70d0654d7391f45697f48d1a3d4c (patch) | |
tree | 2a7c00ee9720d01956694ee055a7497a51cdf7b6 | |
parent | 11427bfeb18b81afeb5fcf67ed5205748ce5be20 (diff) | |
download | chrome-ec-97f1427e200b70d0654d7391f45697f48d1a3d4c.tar.gz |
thermisor: move header to include dir
Move the "thermistor.h" header to the include/driver/temp_sensor
directory. It is used by the Zephyr shim, so the change is useful to
include the header.
BUG=b:180403276
BRANCH=none
TEST=make buildall
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: I0e83df97e50a3b324440b65ddb900ddf135f2439
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2843323
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
49 files changed, 48 insertions, 48 deletions
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 420efdcac0..ffd084c37a 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -41,7 +41,7 @@ #include "task.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index 4a7c2cbbd8..a26f8074e3 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -41,7 +41,7 @@ #include "pwm.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usb_pd_tcpm.h" #include "usbc_ppc.h" diff --git a/baseboard/intelrvp/baseboard.c b/baseboard/intelrvp/baseboard.c index 0f61f33b0f..1e7b778c12 100644 --- a/baseboard/intelrvp/baseboard.c +++ b/baseboard/intelrvp/baseboard.c @@ -14,7 +14,7 @@ #include "peci.h" #include "power.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "timer.h" /* Wake-up pins for hibernate */ diff --git a/baseboard/mancomb/baseboard.c b/baseboard/mancomb/baseboard.c index 083be3522f..48aaa6d165 100644 --- a/baseboard/mancomb/baseboard.c +++ b/baseboard/mancomb/baseboard.c @@ -34,7 +34,7 @@ #include "pwm.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usb_pd_tcpm.h" #include "usbc_ppc.h" diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index e6688e9ab5..5bbb0cc65a 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -40,7 +40,7 @@ #include "task.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usb_pd.h" #include "util.h" diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index d0daf7a4d5..6c1af5da1f 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -15,7 +15,7 @@ #include "i2c.h" #include "power.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" const struct power_signal_info power_signal_list[] = { [X86_SLP_S3_N] = { diff --git a/board/akemi/board.c b/board/akemi/board.c index 730edbac11..94b49f6ff4 100644 --- a/board/akemi/board.c +++ b/board/akemi/board.c @@ -36,7 +36,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/ambassador/board.c b/board/ambassador/board.c index 866623b4d8..322ca7dde7 100644 --- a/board/ambassador/board.c +++ b/board/ambassador/board.c @@ -38,7 +38,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_common.h" diff --git a/board/ampton/board.c b/board/ampton/board.c index b2984036cd..5da4b2635b 100644 --- a/board/ampton/board.c +++ b/board/ampton/board.c @@ -35,7 +35,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_mux.h" #include "usbc_ppc.h" diff --git a/board/berknip/board.c b/board/berknip/board.c index f69bbb8003..f06711f801 100644 --- a/board/berknip/board.c +++ b/board/berknip/board.c @@ -33,7 +33,7 @@ #include "system.h" #include "task.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/bloog/board.c b/board/bloog/board.c index 81e980a47f..7d62fdcf29 100644 --- a/board/bloog/board.c +++ b/board/bloog/board.c @@ -36,7 +36,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usbc_ppc.h" #include "util.h" diff --git a/board/bobba/board.c b/board/bobba/board.c index b0632ab262..ede3e2aa52 100644 --- a/board/bobba/board.c +++ b/board/bobba/board.c @@ -43,7 +43,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_charge.h" #include "usb_mux.h" #include "usbc_ppc.h" diff --git a/board/brya/sensors.c b/board/brya/sensors.c index 13463296b6..90920e15ac 100644 --- a/board/brya/sensors.c +++ b/board/brya/sensors.c @@ -13,7 +13,7 @@ #include "motion_sense.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" /* ADC configuration */ const struct adc_t adc_channels[] = { diff --git a/board/casta/board.c b/board/casta/board.c index 45054be092..7a926563b1 100644 --- a/board/casta/board.c +++ b/board/casta/board.c @@ -33,7 +33,7 @@ #include "system.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usbc_ppc.h" #include "util.h" diff --git a/board/coral/board.c b/board/coral/board.c index 0f58175055..e25ca20e8f 100644 --- a/board/coral/board.c +++ b/board/coral/board.c @@ -45,7 +45,7 @@ #include "tablet_mode.h" #include "task.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "timer.h" #include "uart.h" #include "usb_charge.h" diff --git a/board/dood/board.c b/board/dood/board.c index eaf1e878bb..35ecfecc9e 100644 --- a/board/dood/board.c +++ b/board/dood/board.c @@ -40,7 +40,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_charge.h" #include "usb_mux.h" #include "usbc_ppc.h" diff --git a/board/dooly/board.c b/board/dooly/board.c index 241fa67a2a..cdd26a100f 100644 --- a/board/dooly/board.c +++ b/board/dooly/board.c @@ -42,7 +42,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_common.h" diff --git a/board/dratini/board.c b/board/dratini/board.c index cc47b7678a..9dfa30c8b1 100644 --- a/board/dratini/board.c +++ b/board/dratini/board.c @@ -37,7 +37,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c index b27e8cf248..7ccab07458 100644 --- a/board/ezkinil/board.c +++ b/board/ezkinil/board.c @@ -33,7 +33,7 @@ #include "switch.h" #include "system.h" #include "task.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "temp_sensor.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/fleex/board.c b/board/fleex/board.c index 27ab124e07..82081fed48 100644 --- a/board/fleex/board.c +++ b/board/fleex/board.c @@ -38,7 +38,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usbc_ppc.h" #include "util.h" diff --git a/board/foob/board.c b/board/foob/board.c index c4d2c84cdb..3d6e427220 100644 --- a/board/foob/board.c +++ b/board/foob/board.c @@ -28,7 +28,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "util.h" #include "battery_smart.h" diff --git a/board/garg/board.c b/board/garg/board.c index 285266f66f..32ea8569be 100644 --- a/board/garg/board.c +++ b/board/garg/board.c @@ -35,7 +35,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usbc_ppc.h" #include "util.h" diff --git a/board/genesis/board.c b/board/genesis/board.c index f51b77df8b..0299cb9b77 100644 --- a/board/genesis/board.c +++ b/board/genesis/board.c @@ -32,7 +32,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_common.h" #include "util.h" diff --git a/board/hatch/board.c b/board/hatch/board.c index b3e5e3db0b..a253950815 100644 --- a/board/hatch/board.c +++ b/board/hatch/board.c @@ -36,7 +36,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/helios/board.c b/board/helios/board.c index 38f2d4a63e..16107d8884 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -36,7 +36,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/jinlon/board.c b/board/jinlon/board.c index b232c2a863..796fe95f8e 100644 --- a/board/jinlon/board.c +++ b/board/jinlon/board.c @@ -38,7 +38,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/kindred/board.c b/board/kindred/board.c index 18f8011f1f..4cd49ea312 100644 --- a/board/kindred/board.c +++ b/board/kindred/board.c @@ -40,7 +40,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/kohaku/board.c b/board/kohaku/board.c index 4432444431..6b66fd56e8 100644 --- a/board/kohaku/board.c +++ b/board/kohaku/board.c @@ -35,7 +35,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/lick/board.c b/board/lick/board.c index c173f34e28..42c25e4613 100644 --- a/board/lick/board.c +++ b/board/lick/board.c @@ -28,7 +28,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "util.h" #include "battery_smart.h" diff --git a/board/meep/board.c b/board/meep/board.c index a1d8d1e2c4..8d45c29dbd 100644 --- a/board/meep/board.c +++ b/board/meep/board.c @@ -38,7 +38,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usbc_ppc.h" #include "util.h" diff --git a/board/morphius/board.c b/board/morphius/board.c index 137fc69af9..45af06c4c9 100644 --- a/board/morphius/board.c +++ b/board/morphius/board.c @@ -42,7 +42,7 @@ #include "tablet_mode.h" #include "task.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usb_charge.h" #include "usbc_ppc.h" diff --git a/board/mushu/board.c b/board/mushu/board.c index 3f1ba18d87..c08b3867e3 100644 --- a/board/mushu/board.c +++ b/board/mushu/board.c @@ -38,7 +38,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/nightfury/board.c b/board/nightfury/board.c index 968274b221..9e73ca19e8 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -38,7 +38,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/palkia/board.c b/board/palkia/board.c index 4caae3d2b5..2914f63f45 100644 --- a/board/palkia/board.c +++ b/board/palkia/board.c @@ -33,7 +33,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/phaser/board.c b/board/phaser/board.c index 1f012f3efb..636e14563e 100644 --- a/board/phaser/board.c +++ b/board/phaser/board.c @@ -29,7 +29,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usbc_ppc.h" #include "util.h" #include "battery_smart.h" diff --git a/board/puff/board.c b/board/puff/board.c index c034e06e45..452b63c7a2 100644 --- a/board/puff/board.c +++ b/board/puff/board.c @@ -38,7 +38,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_common.h" diff --git a/board/reef/board.c b/board/reef/board.c index a37ad9e8d4..de0e093860 100644 --- a/board/reef/board.c +++ b/board/reef/board.c @@ -45,7 +45,7 @@ #include "tablet_mode.h" #include "task.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "timer.h" #include "uart.h" #include "usb_charge.h" diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c index e45174e9e1..cdcd88b910 100644 --- a/board/reef_it8320/board.c +++ b/board/reef_it8320/board.c @@ -40,7 +40,7 @@ #include "tablet_mode.h" #include "task.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "timer.h" #include "uart.h" #include "usb_charge.h" diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c index feb363156e..b308b10b65 100644 --- a/board/reef_mchp/board.c +++ b/board/reef_mchp/board.c @@ -49,7 +49,7 @@ #include "task.h" #include "temp_sensor.h" #include "tfdp_chip.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "timer.h" #include "uart.h" #include "usb_charge.h" diff --git a/board/stryke/board.c b/board/stryke/board.c index 73018ceeb6..ad6906dea3 100644 --- a/board/stryke/board.c +++ b/board/stryke/board.c @@ -35,7 +35,7 @@ #include "task.h" #include "temp_sensor.h" #include "thermal.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "uart.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/board/trembyle/board.c b/board/trembyle/board.c index 153ae1be6e..b82b5a6e18 100644 --- a/board/trembyle/board.c +++ b/board/trembyle/board.c @@ -31,7 +31,7 @@ #include "switch.h" #include "system.h" #include "task.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "temp_sensor.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/woomax/board.c b/board/woomax/board.c index 1d884de7c5..5971cde9d4 100644 --- a/board/woomax/board.c +++ b/board/woomax/board.c @@ -36,7 +36,7 @@ #include "tablet_mode.h" #include "task.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/yorp/board.c b/board/yorp/board.c index 0e8bd8aa54..b6431c9da7 100644 --- a/board/yorp/board.c +++ b/board/yorp/board.c @@ -34,7 +34,7 @@ #include "tablet_mode.h" #include "tcpm/tcpci.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "usb_mux.h" #include "usbc_ppc.h" #include "util.h" diff --git a/driver/temp_sensor/bd99992gw.c b/driver/temp_sensor/bd99992gw.c index 0fc8f094b4..e66642224c 100644 --- a/driver/temp_sensor/bd99992gw.c +++ b/driver/temp_sensor/bd99992gw.c @@ -17,7 +17,7 @@ #include "hooks.h" #include "i2c.h" #include "temp_sensor.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "timer.h" #include "util.h" diff --git a/driver/temp_sensor/ec_adc.c b/driver/temp_sensor/ec_adc.c index db174e33dc..196d191e47 100644 --- a/driver/temp_sensor/ec_adc.c +++ b/driver/temp_sensor/ec_adc.c @@ -9,7 +9,7 @@ #include "common.h" #include "console.h" #include "ec_adc.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "util.h" /* Get temperature from requested sensor */ diff --git a/driver/temp_sensor/thermistor.c b/driver/temp_sensor/thermistor.c index dab0e985ce..5a704bf990 100644 --- a/driver/temp_sensor/thermistor.c +++ b/driver/temp_sensor/thermistor.c @@ -8,7 +8,7 @@ #include "adc.h" #include "common.h" #include "gpio.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "util.h" int thermistor_linear_interpolate(uint16_t mv, diff --git a/driver/temp_sensor/thermistor_ncp15wb.c b/driver/temp_sensor/thermistor_ncp15wb.c index 51e884ed35..dba06ee326 100644 --- a/driver/temp_sensor/thermistor_ncp15wb.c +++ b/driver/temp_sensor/thermistor_ncp15wb.c @@ -6,7 +6,7 @@ /* NCP15WB thermistor module for Chrome EC */ #include "common.h" -#include "thermistor.h" +#include "temp_sensor/thermistor.h" #include "util.h" /* diff --git a/driver/temp_sensor/thermistor.h b/include/driver/temp_sensor/thermistor.h index 7ebe2b42ac..7ebe2b42ac 100644 --- a/driver/temp_sensor/thermistor.h +++ b/include/driver/temp_sensor/thermistor.h diff --git a/zephyr/shim/src/temp_sensors.c b/zephyr/shim/src/temp_sensors.c index b29b5f720b..384a86d706 100644 --- a/zephyr/shim/src/temp_sensors.c +++ b/zephyr/shim/src/temp_sensors.c @@ -6,7 +6,7 @@ #include "temp_sensor.h" #include "temp_sensor/temp_sensor.h" #include "adc.h" -#include "../driver/temp_sensor/thermistor.h" +#include "temp_sensor/thermistor.h" #define TEMP_THERMISTOR(node_id) \ [ZSHIM_TEMP_SENSOR_ID(node_id)] = { \ |