diff options
| author | Keith Short <keithshort@chromium.org> | 2019-11-01 12:03:04 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-08 01:01:43 +0000 |
| commit | afb2ed0ec1901eaeb38ae944e1d15562eba2fe7e (patch) | |
| tree | abdfbaf69130b10aba9b444f594e62a45f0aa75d | |
| parent | f60a879fd8d448dbf178e1a98c1efe77e5eaa6b3 (diff) | |
| download | chrome-ec-afb2ed0ec1901eaeb38ae944e1d15562eba2fe7e.tar.gz | |
volteer: Configure ADC channels
Configure ADC channels for temperature sensors. enum adc_channels is
required by the isl9241 charger support.
Addtional changes are still needed to support EC thermal capabilties.
BUG=b:143768086
BRANCH=none
TEST=make buildall
Change-Id: Ia34464e56185e1693dd4c8aed378d7703c290742
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1896640
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
| -rw-r--r-- | baseboard/volteer/baseboard.c | 36 | ||||
| -rw-r--r-- | baseboard/volteer/baseboard.h | 8 | ||||
| -rw-r--r-- | board/volteer/board.h | 3 |
3 files changed, 43 insertions, 4 deletions
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c index 7a2eb207dc..5c780d74b2 100644 --- a/baseboard/volteer/baseboard.c +++ b/baseboard/volteer/baseboard.c @@ -4,7 +4,7 @@ */ /* Volteer family-specific configuration */ -#include "baseboard.h" +#include "adc_chip.h" #include "battery.h" #include "charge_state.h" #include "gpio.h" @@ -14,6 +14,40 @@ #include "pwm_chip.h" /******************************************************************************/ +/* ADC configuration */ +const struct adc_t adc_channels[] = { + [ADC_TEMP_SENSOR_1_CHARGER] = { + .name = "TEMP_CHARGER", + .input_ch = NPCX_ADC_CH0, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_TEMP_SENSOR_2_PP3300_REGULATOR] = { + .name = "TEMP_PP3300_REGULATOR", + .input_ch = NPCX_ADC_CH1, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_TEMP_SENSOR_3_DDR_SOC] = { + .name = "TEMP_DDR_SOC", + .input_ch = NPCX_ADC_CH8, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_TEMP_SENSOR_4_FAN] = { + .name = "TEMP_FAN", + .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); + +/******************************************************************************/ /* Wake up pins */ const enum gpio_signal hibernate_wake_pins[] = { GPIO_LID_OPEN, diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index c022a78b32..c60b75a5a3 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -85,6 +85,14 @@ #ifndef __ASSEMBLER__ +enum adc_channel { + ADC_TEMP_SENSOR_1_CHARGER, + ADC_TEMP_SENSOR_2_PP3300_REGULATOR, + ADC_TEMP_SENSOR_3_DDR_SOC, + ADC_TEMP_SENSOR_4_FAN, + ADC_CH_COUNT +}; + enum pwm_channel { PWM_CH_LED1_BLUE = 0, PWM_CH_LED2_GREEN, diff --git a/board/volteer/board.h b/board/volteer/board.h index b7e7671aff..990dd82194 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -22,9 +22,6 @@ #define CONFIG_POWER_BUTTON -/* Config options automatically enabled by NPCX, re-enable once support added */ -#undef CONFIG_ADC - #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 4096 |