diff options
| author | Ko_Ko <Ko_Ko@compal.corp-partner.google.com> | 2021-06-09 15:49:52 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-16 03:59:03 +0000 |
| commit | fb7967ae4b50f945df266ac033a80b0bdd8805f9 (patch) | |
| tree | 509fb1782a0c23364accdf0c253ea9ea2da1efb2 /board/brya | |
| parent | 8b76bbe2f5a162f21cc78fdafd49225e28a1cc02 (diff) | |
| download | chrome-ec-fb7967ae4b50f945df266ac033a80b0bdd8805f9.tar.gz | |
brya: Add 2 ADC Channels for P2 build
Add 2 ADC channels SENSOR_3_CHARGER and ADC_TEMP_SENSOR_4_WWAN, and
change sensor 2 naming for adc and thermal params.
BUG=b:181271666, b:183452273
BRANCH=none
TEST=build ec.bin and flash ec after not affect boot.
Signed-off-by: Ko_Ko <Ko_Ko@compal.corp-partner.google.com>
Change-Id: Ib26c264532c52364dc21eeca59c0611001898a42
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2905161
Reviewed-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-by: Ko Ko <ko_ko@compal.corp-partner.google.com>
Tested-by: Ko Ko <ko_ko@compal.corp-partner.google.com>
Tested-by: Owen Ou <owen_ou@compal.corp-partner.google.com>
Commit-Queue: Owen Ou <owen_ou@compal.corp-partner.google.com>
Auto-Submit: Owen Ou <owen_ou@compal.corp-partner.google.com>
Diffstat (limited to 'board/brya')
| -rw-r--r-- | board/brya/board.h | 6 | ||||
| -rw-r--r-- | board/brya/sensors.c | 28 |
2 files changed, 25 insertions, 9 deletions
diff --git a/board/brya/board.h b/board/brya/board.h index 023d8867bd..eecdb130d1 100644 --- a/board/brya/board.h +++ b/board/brya/board.h @@ -210,13 +210,15 @@ enum adc_channel { ADC_TEMP_SENSOR_1_DDR_SOC, - ADC_TEMP_SENSOR_2_CHARGER, + ADC_TEMP_SENSOR_2_FAN, + ADC_TEMP_SENSOR_3_CHARGER, + ADC_TEMP_SENSOR_4_WWAN, ADC_CH_COUNT }; enum temp_sensor_id { TEMP_SENSOR_1_DDR_SOC, - TEMP_SENSOR_2_CHARGER, + TEMP_SENSOR_2_FAN, TEMP_SENSOR_COUNT }; diff --git a/board/brya/sensors.c b/board/brya/sensors.c index 434553f5dd..84be4060a3 100644 --- a/board/brya/sensors.c +++ b/board/brya/sensors.c @@ -24,13 +24,27 @@ const struct adc_t adc_channels[] = { .factor_div = ADC_READ_MAX + 1, .shift = 0, }, - [ADC_TEMP_SENSOR_2_CHARGER] = { - .name = "TEMP_CHARGER", + [ADC_TEMP_SENSOR_2_FAN] = { + .name = "TEMP_FAN", .input_ch = NPCX_ADC_CH1, .factor_mul = ADC_MAX_VOLT, .factor_div = ADC_READ_MAX + 1, .shift = 0, }, + [ADC_TEMP_SENSOR_3_CHARGER] = { + .name = "TEMP_CHARGER", + .input_ch = NPCX_ADC_CH6, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_TEMP_SENSOR_4_WWAN] = { + .name = "TEMP_WWAN", + .input_ch = NPCX_ADC_CH7, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -260,11 +274,11 @@ const struct temp_sensor_t temp_sensors[] = { .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_1_DDR_SOC }, - [TEMP_SENSOR_2_CHARGER] = { - .name = "Charger", + [TEMP_SENSOR_2_FAN] = { + .name = "FAN", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, - .idx = ADC_TEMP_SENSOR_2_CHARGER + .idx = ADC_TEMP_SENSOR_2_FAN }, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); @@ -301,7 +315,7 @@ static const struct ec_thermal_config thermal_cpu = { * Inductors: limit of 125c * PCB: limit is 80c */ -static const struct ec_thermal_config thermal_inductor = { +static const struct ec_thermal_config thermal_fan = { .temp_host = { [EC_TEMP_THRESH_HIGH] = C_TO_K(75), [EC_TEMP_THRESH_HALT] = C_TO_K(80), @@ -316,6 +330,6 @@ static const struct ec_thermal_config thermal_inductor = { /* this should really be "const" */ struct ec_thermal_config thermal_params[] = { [TEMP_SENSOR_1_DDR_SOC] = thermal_cpu, - [TEMP_SENSOR_2_CHARGER] = thermal_inductor, + [TEMP_SENSOR_2_FAN] = thermal_fan, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); |