diff options
| author | Philip Chen <philipchen@google.com> | 2019-09-06 09:47:14 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-09-18 02:50:56 +0000 |
| commit | 1af858387ff7ccdd656db77340fc81b3dc7e4453 (patch) | |
| tree | 44a177b4935953ff535176b2d3e9fb053b454e5e | |
| parent | ad20ea449951e49ecd991ade3a8f3f5a3fd7a227 (diff) | |
| download | chrome-ec-1af858387ff7ccdd656db77340fc81b3dc7e4453.tar.gz | |
helios: Add support for TEMP_SENSOR3
A new temperature sensor is added to Helios board, close to the
audio jack. It is used to support the speaker calibration test in
the factory.
This patch adds support for this temperature sensor.
BUG=b:139335207
BRANCH=none
TEST=temp command in EC console
Change-Id: I766240540ad55b80a1aae3e1a9fb8f3286aba679
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1803975
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Tested-by: Philip Chen <philipchen@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
| -rw-r--r-- | board/helios/board.c | 11 | ||||
| -rw-r--r-- | board/helios/board.h | 2 | ||||
| -rw-r--r-- | board/helios/gpio.inc | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/board/helios/board.c b/board/helios/board.c index 4fdff0cf84..0b11c17673 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -341,9 +341,11 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT); /* ADC channels */ const struct adc_t adc_channels[] = { [ADC_TEMP_SENSOR_1] = { - "TEMP_AMB", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, + "TEMP_CHARGER", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, [ADC_TEMP_SENSOR_2] = { - "TEMP_CHARGER", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, + "TEMP_5V_REG", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, + [ADC_TEMP_SENSOR_3] = { + "TEMP_AMB", NPCX_ADC_CH3, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -358,6 +360,11 @@ const struct temp_sensor_t temp_sensors[] = { .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_2, .action_delay_sec = 1}, + [TEMP_SENSOR_3] = {.name = "Temp3", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_30k9_47k_4050b, + .idx = ADC_TEMP_SENSOR_3, + .action_delay_sec = 1}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/helios/board.h b/board/helios/board.h index 28be64e7ce..1b502a4f6c 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -100,6 +100,7 @@ enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC0 */ ADC_TEMP_SENSOR_2, /* ADC1 */ + ADC_TEMP_SENSOR_3, /* ADC3 */ ADC_CH_COUNT }; @@ -132,6 +133,7 @@ enum mft_channel { enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, + TEMP_SENSOR_3, TEMP_SENSOR_COUNT }; diff --git a/board/helios/gpio.inc b/board/helios/gpio.inc index 9397d3dcfa..6a88a2f07d 100644 --- a/board/helios/gpio.inc +++ b/board/helios/gpio.inc @@ -113,7 +113,7 @@ ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PW ALTERNATE(PIN_MASK(4, 0x01), 0, MODULE_PWM, 0) /* TA1 - Fan Tachometer */ /* ADC */ -ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ +ALTERNATE(PIN_MASK(4, 0x34), 0, MODULE_ADC, 0) /* ADC0, ADC1, ADC3 */ /* Power Switch Logic (PSL) inputs */ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, 0) /* GPIOD2 = LID_OPEN */ |