diff options
author | Devin Lu <Devin.Lu@quantatw.com> | 2020-07-09 18:58:33 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-07-14 05:22:14 +0000 |
commit | ac66d1eb5c19e8c5b974617f2ccd0dc571027cf8 (patch) | |
tree | 1aa6f9f9bae66104e04eae8880dccce9e8d3b1a2 | |
parent | 81abfa1eba1195c87b206711f59d4a92675845b2 (diff) | |
download | chrome-ec-ac66d1eb5c19e8c5b974617f2ccd0dc571027cf8.tar.gz |
dedede: Move adc channel to board variant
Dedede family may have different temp sensors for other ADCs channel.
This patch moves adc channel to board variant.
BUG=none
BRANCH=none
TEST=make buildall -j
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: Id34a924fc9431a553a1467068c6ccee6111102bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2289478
Reviewed-by: Diana Z <dzigterman@chromium.org>
-rw-r--r-- | baseboard/dedede/baseboard.h | 8 | ||||
-rw-r--r-- | baseboard/dedede/variant_ec_it8320.c | 33 | ||||
-rw-r--r-- | baseboard/dedede/variant_ec_npcx796fc.c | 33 | ||||
-rw-r--r-- | board/boten/board.c | 34 | ||||
-rw-r--r-- | board/boten/board.h | 9 | ||||
-rw-r--r-- | board/drawcia/board.c | 34 | ||||
-rw-r--r-- | board/drawcia/board.h | 9 | ||||
-rw-r--r-- | board/magolor/board.c | 33 | ||||
-rw-r--r-- | board/waddledee/board.c | 34 | ||||
-rw-r--r-- | board/waddledee/board.h | 9 | ||||
-rw-r--r-- | board/waddledoo/board.c | 33 | ||||
-rw-r--r-- | board/wheelie/board.c | 34 | ||||
-rw-r--r-- | board/wheelie/board.h | 9 |
13 files changed, 238 insertions, 74 deletions
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index f60c568e13..0364bffea1 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -203,14 +203,6 @@ /* Common enums */ #if defined(VARIANT_DEDEDE_EC_NPCX796FC) #elif defined(VARIANT_DEDEDE_EC_IT8320) - enum adc_channel { - ADC_VSNS_PP3300_A, /* ADC0 */ - ADC_TEMP_SENSOR_1, /* ADC2 */ - ADC_TEMP_SENSOR_2, /* ADC3 */ - ADC_SUB_ANALOG, /* ADC13 */ - ADC_CH_COUNT - }; - enum board_vcmp { VCMP_SNS_PP3300_LOW, VCMP_SNS_PP3300_HIGH, diff --git a/baseboard/dedede/variant_ec_it8320.c b/baseboard/dedede/variant_ec_it8320.c index d139f0762d..55c84cb2c0 100644 --- a/baseboard/dedede/variant_ec_it8320.c +++ b/baseboard/dedede/variant_ec_it8320.c @@ -18,39 +18,6 @@ #define CPRINTUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) -/* ADC channels */ -const struct adc_t adc_channels[] = { - [ADC_VSNS_PP3300_A] = { - .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] = { - .name = "TEMP_SENSOR1", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH2 - }, - [ADC_TEMP_SENSOR_2] = { - .name = "TEMP_SENSOR2", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH3 - }, - [ADC_SUB_ANALOG] = { - .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); - static void pp3300_a_pgood_low(void) { atomic_clear(&pp3300_a_pgood, 1); diff --git a/baseboard/dedede/variant_ec_npcx796fc.c b/baseboard/dedede/variant_ec_npcx796fc.c index 515db4102b..966ffd30a1 100644 --- a/baseboard/dedede/variant_ec_npcx796fc.c +++ b/baseboard/dedede/variant_ec_npcx796fc.c @@ -26,39 +26,6 @@ #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args) #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) -/* ADC channels */ -const struct adc_t adc_channels[] = { - [ADC_TEMP_SENSOR_1] = { - .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] = { - .name = "TEMP_SENSOR2", - .input_ch = NPCX_ADC_CH1, - .factor_mul = ADC_MAX_VOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - }, - [ADC_SUB_ANALOG] = { - .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] = { - .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); - void pp3300_a_pgood_high(void) { atomic_or(&pp3300_a_pgood, 1); diff --git a/board/boten/board.c b/board/boten/board.c index 8a11679fc2..44670d2041 100644 --- a/board/boten/board.c +++ b/board/boten/board.c @@ -5,6 +5,7 @@ /* Waddledee board-specific configuration */ +#include "adc_chip.h" #include "button.h" #include "charge_manager.h" #include "charge_state_v2.h" @@ -64,6 +65,39 @@ static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) /* Must come after other header files and interrupt handler declarations */ #include "gpio_list.h" +/* ADC channels */ +const struct adc_t adc_channels[] = { + [ADC_VSNS_PP3300_A] = { + .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] = { + .name = "TEMP_SENSOR1", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH2 + }, + [ADC_TEMP_SENSOR_2] = { + .name = "TEMP_SENSOR2", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH3 + }, + [ADC_SUB_ANALOG] = { + .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); + /* BC 1.2 chips */ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { { diff --git a/board/boten/board.h b/board/boten/board.h index b2f17ba47d..289925742d 100644 --- a/board/boten/board.h +++ b/board/boten/board.h @@ -96,6 +96,15 @@ enum sensor_id { SENSOR_COUNT }; +/* ADC channels */ +enum adc_channel { + ADC_VSNS_PP3300_A, /* ADC0 */ + ADC_TEMP_SENSOR_1, /* ADC2 */ + ADC_TEMP_SENSOR_2, /* ADC3 */ + ADC_SUB_ANALOG, /* ADC13 */ + ADC_CH_COUNT +}; + enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, diff --git a/board/drawcia/board.c b/board/drawcia/board.c index 6b6a433787..bec15a77d6 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -5,6 +5,7 @@ /* Drawcia board-specific configuration */ +#include "adc_chip.h" #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" @@ -137,6 +138,39 @@ static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) /* Must come after other header files and interrupt handler declarations */ #include "gpio_list.h" +/* ADC channels */ +const struct adc_t adc_channels[] = { + [ADC_VSNS_PP3300_A] = { + .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] = { + .name = "TEMP_SENSOR1", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH2 + }, + [ADC_TEMP_SENSOR_2] = { + .name = "TEMP_SENSOR2", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH3 + }, + [ADC_SUB_ANALOG] = { + .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); + /* BC 1.2 chips */ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { { diff --git a/board/drawcia/board.h b/board/drawcia/board.h index 9ea959ea74..e814bbc518 100644 --- a/board/drawcia/board.h +++ b/board/drawcia/board.h @@ -108,6 +108,15 @@ enum sensor_id { SENSOR_COUNT }; +/* ADC channels */ +enum adc_channel { + ADC_VSNS_PP3300_A, /* ADC0 */ + ADC_TEMP_SENSOR_1, /* ADC2 */ + ADC_TEMP_SENSOR_2, /* ADC3 */ + ADC_SUB_ANALOG, /* ADC13 */ + ADC_CH_COUNT +}; + enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, diff --git a/board/magolor/board.c b/board/magolor/board.c index b28c9a8153..54c0e58d3c 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -72,6 +72,39 @@ static void sub_usb_c1_interrupt(enum gpio_signal s) #include "gpio_list.h" +/* ADC channels */ +const struct adc_t adc_channels[] = { + [ADC_TEMP_SENSOR_1] = { + .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] = { + .name = "TEMP_SENSOR2", + .input_ch = NPCX_ADC_CH1, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_SUB_ANALOG] = { + .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] = { + .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); + void board_init(void) { int on; diff --git a/board/waddledee/board.c b/board/waddledee/board.c index 5a61565804..11e48a0a26 100644 --- a/board/waddledee/board.c +++ b/board/waddledee/board.c @@ -5,6 +5,7 @@ /* Waddledee board-specific configuration */ +#include "adc_chip.h" #include "button.h" #include "charge_manager.h" #include "charge_state_v2.h" @@ -125,6 +126,39 @@ static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) /* Must come after other header files and interrupt handler declarations */ #include "gpio_list.h" +/* ADC channels */ +const struct adc_t adc_channels[] = { + [ADC_VSNS_PP3300_A] = { + .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] = { + .name = "TEMP_SENSOR1", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH2 + }, + [ADC_TEMP_SENSOR_2] = { + .name = "TEMP_SENSOR2", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH3 + }, + [ADC_SUB_ANALOG] = { + .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); + /* BC 1.2 chips */ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { { diff --git a/board/waddledee/board.h b/board/waddledee/board.h index a1d59b0fd6..15f775a9d8 100644 --- a/board/waddledee/board.h +++ b/board/waddledee/board.h @@ -103,6 +103,15 @@ enum sensor_id { SENSOR_COUNT }; +/* ADC channels */ +enum adc_channel { + ADC_VSNS_PP3300_A, /* ADC0 */ + ADC_TEMP_SENSOR_1, /* ADC2 */ + ADC_TEMP_SENSOR_2, /* ADC3 */ + ADC_SUB_ANALOG, /* ADC13 */ + ADC_CH_COUNT +}; + enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c index 590a240add..41e93fc8ef 100644 --- a/board/waddledoo/board.c +++ b/board/waddledoo/board.c @@ -80,6 +80,39 @@ static void sub_hdmi_hpd_interrupt(enum gpio_signal s) #include "gpio_list.h" +/* ADC channels */ +const struct adc_t adc_channels[] = { + [ADC_TEMP_SENSOR_1] = { + .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] = { + .name = "TEMP_SENSOR2", + .input_ch = NPCX_ADC_CH1, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, + [ADC_SUB_ANALOG] = { + .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] = { + .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); + void board_init(void) { int on; diff --git a/board/wheelie/board.c b/board/wheelie/board.c index 4ccf93b0d5..22f6bca2f0 100644 --- a/board/wheelie/board.c +++ b/board/wheelie/board.c @@ -5,6 +5,7 @@ /* Wheelie board-specific configuration */ +#include "adc_chip.h" #include "button.h" #include "charge_manager.h" #include "charge_state_v2.h" @@ -65,6 +66,39 @@ static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) /* Must come after other header files and interrupt handler declarations */ #include "gpio_list.h" +/* ADC channels */ +const struct adc_t adc_channels[] = { + [ADC_VSNS_PP3300_A] = { + .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] = { + .name = "TEMP_SENSOR1", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH2 + }, + [ADC_TEMP_SENSOR_2] = { + .name = "TEMP_SENSOR2", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH3 + }, + [ADC_SUB_ANALOG] = { + .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); + /* BC 1.2 chips */ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { { diff --git a/board/wheelie/board.h b/board/wheelie/board.h index f8c567dc3f..07a4a6fd0f 100644 --- a/board/wheelie/board.h +++ b/board/wheelie/board.h @@ -104,6 +104,15 @@ enum sensor_id { SENSOR_COUNT }; +/* ADC channels */ +enum adc_channel { + ADC_VSNS_PP3300_A, /* ADC0 */ + ADC_TEMP_SENSOR_1, /* ADC2 */ + ADC_TEMP_SENSOR_2, /* ADC3 */ + ADC_SUB_ANALOG, /* ADC13 */ + ADC_CH_COUNT +}; + enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, |