diff options
author | Devin Lu <Devin.Lu@quantatw.com> | 2020-07-01 16:36:08 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-07-02 07:39:31 +0000 |
commit | 36ef3cde9552fc78dd500df7dc8f39b85ccae950 (patch) | |
tree | 7ba0b630ac8c533bff7d27ff3fe77f98deb2d311 /baseboard/dedede | |
parent | 2adb19bffa152cfa3fa0955b8aa5a42ab75cc6f5 (diff) | |
download | chrome-ec-36ef3cde9552fc78dd500df7dc8f39b85ccae950.tar.gz |
dedede: it83xx: fix adc data structure order
This is a difference adc data structure order between
it83xx and npcx7. The data structure must be in the
exactly same order as in enum adc_channel. This patch
fixes incorrect order for it83xx.
BUG=none
BRANCH=none
TEST=adc command in EC console
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: Ibe7326e897814defb57196fd2213f8a3a5dea9db
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2275503
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'baseboard/dedede')
-rw-r--r-- | baseboard/dedede/variant_ec_it8320.c | 31 | ||||
-rw-r--r-- | baseboard/dedede/variant_ec_npcx796fc.c | 32 |
2 files changed, 48 insertions, 15 deletions
diff --git a/baseboard/dedede/variant_ec_it8320.c b/baseboard/dedede/variant_ec_it8320.c index 561db39855..d139f0762d 100644 --- a/baseboard/dedede/variant_ec_it8320.c +++ b/baseboard/dedede/variant_ec_it8320.c @@ -21,16 +21,33 @@ /* ADC channels */ const struct adc_t adc_channels[] = { [ADC_VSNS_PP3300_A] = { - "PP3300_A_PGOOD", CHIP_ADC_CH0, ADC_MAX_MVOLT, ADC_READ_MAX+1, - 0}, + .name = "PP3300_A_PGOOD", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH0 + }, [ADC_TEMP_SENSOR_1] = { - "TEMP_SENSOR1", CHIP_ADC_CH2, ADC_MAX_MVOLT, ADC_READ_MAX+1, 0}, - + .name = "TEMP_SENSOR1", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH2 + }, [ADC_TEMP_SENSOR_2] = { - "TEMP_SENSOR2", CHIP_ADC_CH3, ADC_MAX_MVOLT, ADC_READ_MAX+1, 0}, - + .name = "TEMP_SENSOR2", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH3 + }, [ADC_SUB_ANALOG] = { - "SUB_ANALOG", CHIP_ADC_CH13, ADC_MAX_MVOLT, ADC_READ_MAX+1, 0}, + .name = "SUB_ANALOG", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH13 + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); diff --git a/baseboard/dedede/variant_ec_npcx796fc.c b/baseboard/dedede/variant_ec_npcx796fc.c index 98ba57b70b..515db4102b 100644 --- a/baseboard/dedede/variant_ec_npcx796fc.c +++ b/baseboard/dedede/variant_ec_npcx796fc.c @@ -29,17 +29,33 @@ /* ADC channels */ const struct adc_t adc_channels[] = { [ADC_TEMP_SENSOR_1] = { - "TEMP_SENSOR1", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, - + .name = "TEMP_SENSOR1", + .input_ch = NPCX_ADC_CH0, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, [ADC_TEMP_SENSOR_2] = { - "TEMP_SENSOR2", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, - + .name = "TEMP_SENSOR2", + .input_ch = NPCX_ADC_CH1, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, [ADC_SUB_ANALOG] = { - "SUB_ANALOG", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, - + .name = "SUB_ANALOG", + .input_ch = NPCX_ADC_CH2, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, [ADC_VSNS_PP3300_A] = { - "PP3300_A_PGOOD", NPCX_ADC_CH9, ADC_MAX_VOLT, ADC_READ_MAX+1, - 0}, + .name = "PP3300_A_PGOOD", + .input_ch = NPCX_ADC_CH9, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); |