diff options
| author | Devin Lu <devin.lu@quantatw.com> | 2019-11-20 18:04:32 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-22 06:03:16 +0000 |
| commit | b25323c4fa6797c8ecf9a2df24f7d864d56ca922 (patch) | |
| tree | b8b5bdc0e82a29a441a767dccba32bb1f1f5b44f | |
| parent | 89eee491e4f4744a0602d5362e39c5618cab06c1 (diff) | |
| download | chrome-ec-b25323c4fa6797c8ecf9a2df24f7d864d56ca922.tar.gz | |
Dratini/Jinlon: Add support for TEMP_SENSOR3
A new temperature sensor is added to Dratini/Jinlon boards, close to the
CPU. It is used to support the fan control.
BUG=none
BRANCH=hatch
TEST=temp command in EC console
Change-Id: Icd5974133da5e1aec81f2201f87e1b83b79c6169
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1925802
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
| -rw-r--r-- | board/dratini/board.c | 15 | ||||
| -rw-r--r-- | board/dratini/board.h | 2 | ||||
| -rw-r--r-- | board/dratini/gpio.inc | 2 | ||||
| -rw-r--r-- | board/jinlon/board.c | 15 | ||||
| -rw-r--r-- | board/jinlon/board.h | 2 | ||||
| -rw-r--r-- | board/jinlon/gpio.inc | 2 |
6 files changed, 28 insertions, 10 deletions
diff --git a/board/dratini/board.c b/board/dratini/board.c index 08c9de6c74..4a1ff9a6e1 100644 --- a/board/dratini/board.c +++ b/board/dratini/board.c @@ -298,23 +298,30 @@ 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_CPU", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Temp1", + [TEMP_SENSOR_1] = {.name = "Charger", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_1, .action_delay_sec = 1}, - [TEMP_SENSOR_2] = {.name = "Temp2", + [TEMP_SENSOR_2] = {.name = "5V Reg", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_2, .action_delay_sec = 1}, + [TEMP_SENSOR_3] = {.name = "CPU", + .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/dratini/board.h b/board/dratini/board.h index aae65bee40..e8d0a9affa 100644 --- a/board/dratini/board.h +++ b/board/dratini/board.h @@ -125,6 +125,7 @@ enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC0 */ ADC_TEMP_SENSOR_2, /* ADC1 */ + ADC_TEMP_SENSOR_3, /* ADC2 */ ADC_CH_COUNT }; @@ -156,6 +157,7 @@ enum mft_channel { enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, + TEMP_SENSOR_3, TEMP_SENSOR_COUNT }; diff --git a/board/dratini/gpio.inc b/board/dratini/gpio.inc index 8faa96fb89..558ceab351 100644 --- a/board/dratini/gpio.inc +++ b/board/dratini/gpio.inc @@ -124,7 +124,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, 0x38), 0, MODULE_ADC, 0) /* ADC0-2 */ /* Power Switch Logic (PSL) inputs */ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, 0) /* GPIOD2 = LID_OPEN */ diff --git a/board/jinlon/board.c b/board/jinlon/board.c index 6139df1685..55faaae736 100644 --- a/board/jinlon/board.c +++ b/board/jinlon/board.c @@ -296,23 +296,30 @@ 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_CPU", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Temp1", + [TEMP_SENSOR_1] = {.name = "Charger", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_1, .action_delay_sec = 1}, - [TEMP_SENSOR_2] = {.name = "Temp2", + [TEMP_SENSOR_2] = {.name = "5v Reg", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_2, .action_delay_sec = 1}, + [TEMP_SENSOR_3] = {.name = "CPU", + .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/jinlon/board.h b/board/jinlon/board.h index e15e6fa036..9891173781 100644 --- a/board/jinlon/board.h +++ b/board/jinlon/board.h @@ -126,6 +126,7 @@ enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC0 */ ADC_TEMP_SENSOR_2, /* ADC1 */ + ADC_TEMP_SENSOR_3, /* ADC2 */ ADC_CH_COUNT }; @@ -157,6 +158,7 @@ enum mft_channel { enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, + TEMP_SENSOR_3, TEMP_SENSOR_COUNT }; diff --git a/board/jinlon/gpio.inc b/board/jinlon/gpio.inc index d22160721a..7f14dc575d 100644 --- a/board/jinlon/gpio.inc +++ b/board/jinlon/gpio.inc @@ -124,7 +124,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, 0x38), 0, MODULE_ADC, 0) /* ADC0-2*/ /* Power Switch Logic (PSL) inputs */ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, 0) /* GPIOD2 = LID_OPEN */ |