diff options
| author | Devin Lu <devin.lu@quantatw.com> | 2020-06-04 08:58:12 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-15 00:11:18 +0000 |
| commit | e2a86fa31cda43b76ddfec4df6a1a9cf91f90e6c (patch) | |
| tree | c5fc13476bb08ca81e53d34c74db012de24c7d46 /board/berknip | |
| parent | 6bf64c105990fb33b6ffdbb603ca0dff8f4085a6 (diff) | |
| download | chrome-ec-e2a86fa31cda43b76ddfec4df6a1a9cf91f90e6c.tar.gz | |
zork/baseboard: move temperature sensors definition to board variant
There are some differences with temperature sensors for each zork variant.
This patch move temperature sensors definition to board variant.
BUG=b:157711232
BRANCH=none
TEST=Verified console "temps" can read temperature.
Build all zork board variant.
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: Ib109ea5adc98e6b6825f8c91db19911dc682a52e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2227787
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Tested-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'board/berknip')
| -rw-r--r-- | board/berknip/board.c | 44 | ||||
| -rw-r--r-- | board/berknip/board.h | 13 |
2 files changed, 57 insertions, 0 deletions
diff --git a/board/berknip/board.c b/board/berknip/board.c index 1562c91eeb..634168dc89 100644 --- a/board/berknip/board.c +++ b/board/berknip/board.c @@ -5,12 +5,15 @@ /* Berknip board configuration */ +#include "adc.h" +#include "adc_chip.h" #include "button.h" #include "cbi_ec_fw_config.h" #include "driver/accelgyro_bmi_common.h" #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" #include "driver/retimer/tusb544.h" +#include "driver/temp_sensor/sb_tsi.h" #include "driver/usb_mux/amd_fp5.h" #include "driver/usb_mux/ps8743.h" #include "extpower.h" @@ -26,6 +29,7 @@ #include "switch.h" #include "system.h" #include "task.h" +#include "temp_sensor.h" #include "usb_charge.h" #include "usb_mux.h" @@ -313,6 +317,46 @@ const struct fan_t fans[] = { }; BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT); +const struct adc_t adc_channels[] = { + [ADC_TEMP_SENSOR_CHARGER] = { + .name = "CHARGER", + .input_ch = NPCX_ADC_CH2, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_TEMP_SENSOR_SOC] = { + .name = "SOC", + .input_ch = NPCX_ADC_CH3, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, +}; +BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); + +const struct temp_sensor_t temp_sensors[] = { + [TEMP_SENSOR_CHARGER] = { + .name = "Charger", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = board_get_temp, + .idx = TEMP_SENSOR_CHARGER, + }, + [TEMP_SENSOR_SOC] = { + .name = "SOC", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = board_get_temp, + .idx = TEMP_SENSOR_SOC, + }, + [TEMP_SENSOR_CPU] = { + .name = "CPU", + .type = TEMP_SENSOR_TYPE_CPU, + .read = sb_tsi_get_val, + .idx = 0, + }, +}; +BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); + const static struct ec_thermal_config thermal_thermistor = { .temp_host = { [EC_TEMP_THRESH_HIGH] = C_TO_K(75), diff --git a/board/berknip/board.h b/board/berknip/board.h index cf0fd6df07..83e5614ab6 100644 --- a/board/berknip/board.h +++ b/board/berknip/board.h @@ -69,6 +69,12 @@ #ifndef __ASSEMBLER__ +enum adc_channel { + ADC_TEMP_SENSOR_CHARGER, + ADC_TEMP_SENSOR_SOC, + ADC_CH_COUNT +}; + enum battery_type { BATTERY_SIMPLO_HIGHPOWER, BATTERY_COSMX, @@ -87,6 +93,13 @@ enum pwm_channel { PWM_CH_COUNT }; +enum temp_sensor_id { + TEMP_SENSOR_CHARGER = 0, + TEMP_SENSOR_SOC, + TEMP_SENSOR_CPU, + TEMP_SENSOR_COUNT +}; + /***************************************************************************** * CBI EC FW Configuration |