diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-11-15 10:10:57 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-11-19 19:13:58 -0800 |
| commit | 34747dbadded27fa5c76b0d3e1e607a81908c718 (patch) | |
| tree | 844d30ce11cbd15f2c47a241f1e8c59719a35ce2 /board/fleex | |
| parent | a253f5c60a32f7a82d57a1ed07983925e1e2c8bc (diff) | |
| download | chrome-ec-34747dbadded27fa5c76b0d3e1e607a81908c718.tar.gz | |
ocotpus: move VBUS_ADC config to base
All boards but yorp have added the ADC hardware support back for VBUS
ADC measurements. Move code to common baseboard
BRANCH=none
BUG=none
TEST=ADC measurements still works on phaser and fleex
Change-Id: I36a7ba92df21de4c1188613c6a12da83fdba6eb6
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1337456
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board/fleex')
| -rw-r--r-- | board/fleex/board.c | 9 | ||||
| -rw-r--r-- | board/fleex/board.h | 8 | ||||
| -rw-r--r-- | board/fleex/gpio.inc | 2 |
3 files changed, 4 insertions, 15 deletions
diff --git a/board/fleex/board.c b/board/fleex/board.c index e1d05853a0..3b6490e7d3 100644 --- a/board/fleex/board.c +++ b/board/fleex/board.c @@ -80,15 +80,6 @@ const struct adc_t adc_channels[] = { }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); -enum adc_channel board_get_vbus_adc(int port) -{ - if (port == USB_PD_PORT_ANX7447) - return ADC_VBUS_C0; - if (port == USB_PD_PORT_PS8751) - return ADC_VBUS_C1; - return ADC_VBUS_C0; -} - const struct temp_sensor_t temp_sensors[] = { [TEMP_SENSOR_BATTERY] = {.name = "Battery", .type = TEMP_SENSOR_TYPE_BATTERY, diff --git a/board/fleex/board.h b/board/fleex/board.h index 1e8927d3e9..9255bf861c 100644 --- a/board/fleex/board.h +++ b/board/fleex/board.h @@ -27,10 +27,6 @@ #define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT -/* USB PD */ -#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -#undef CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT - /* Volume button */ #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL @@ -64,8 +60,8 @@ enum adc_channel { ADC_TEMP_SENSOR_AMB, /* ADC0 */ ADC_TEMP_SENSOR_CHARGER, /* ADC1 */ - ADC_VBUS_C1, /* ADC4 */ - ADC_VBUS_C0, /* ADC9 */ + ADC_VBUS_C0, /* ADC9 */ + ADC_VBUS_C1, /* ADC4 */ ADC_CH_COUNT }; diff --git a/board/fleex/gpio.inc b/board/fleex/gpio.inc index 294d2ce1b5..ee57a3ecfb 100644 --- a/board/fleex/gpio.inc +++ b/board/fleex/gpio.inc @@ -162,6 +162,8 @@ ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* I2C3 */ ALTERNATE(PIN_MASK(F, 0x0C), 0, MODULE_I2C, 0) /* I2C4 */ ALTERNATE(PIN_MASK(B, 0x0C), 0, MODULE_I2C, GPIO_SEL_1P8V) /* I2C7 - 1.8V */ ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ +ALTERNATE(PIN_MASK(4, 0x02), 0, MODULE_ADC, 0) /* ADC4 */ +ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0) /* ADC9 */ ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* PWM3: KB_BL_PWM */ /* Power Switch Logic (PSL) inputs */ |