From 9a80691c33801f9343c0ebd42e643fa6cb2cdec2 Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Wed, 6 Jun 2018 11:15:30 -0600 Subject: [PATCH] octopus: remove ADCs for VBUS Hardware does not support ADCs for Vbus anymore for all boards except bip. Make bip the same as other octopus boards (i.e. not using ADCs for Vbus measurements). BRANCH=none BUG=b:109747036 TEST=CL stack works with current yorp Change-Id: I96b82b70799e8b70bf5d479a1714524fc1652140 Signed-off-by: Jett Rink Reviewed-on: https://chromium-review.googlesource.com/1089199 Reviewed-by: Furquan Shaikh --- baseboard/octopus/baseboard.h | 2 +- board/bip/board.c | 5 ----- board/phaser/board.h | 4 ---- board/yorp/board.c | 12 ------------ board/yorp/board.h | 2 -- board/yorp/gpio.inc | 2 -- 6 files changed, 1 insertion(+), 26 deletions(-) diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 61213f6f9a..33b94507fb 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -179,7 +179,7 @@ #define CONFIG_USBC_SS_MUX #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT +#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_BC12_DETECT_BQ24392 diff --git a/board/bip/board.c b/board/bip/board.c index 171e873dfb..53e17b9aeb 100644 --- a/board/bip/board.c +++ b/board/bip/board.c @@ -60,11 +60,6 @@ const struct spi_device_t spi_devices[] = { }; const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); -enum adc_channel board_get_vbus_adc(int port) -{ - return port ? ADC_VBUS_C1 : ADC_VBUS_C0; -} - void board_overcurrent_event(int port) { /* TODO(b/78344554): pass this signal upstream once hardware reworked */ diff --git a/board/phaser/board.h b/board/phaser/board.h index ff2c214702..493b353a09 100644 --- a/board/phaser/board.h +++ b/board/phaser/board.h @@ -16,10 +16,6 @@ /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ -/* We don't have Vbus ADCs */ -#undef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT - #ifndef __ASSEMBLER__ #include "gpio_signal.h" diff --git a/board/yorp/board.c b/board/yorp/board.c index 8e2ba6fcf3..0c9a7df214 100644 --- a/board/yorp/board.c +++ b/board/yorp/board.c @@ -80,12 +80,6 @@ const struct adc_t adc_channels[] = { "TEMP_AMB", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, [ADC_TEMP_SENSOR_CHARGER] = { "TEMP_CHARGER", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, - /* Vbus C0 sensing (10x voltage divider). PPVAR_USB_C0_VBUS */ - [ADC_VBUS_C0] = { - "VBUS_C0", NPCX_ADC_CH4, ADC_MAX_VOLT*10, ADC_READ_MAX+1, 0}, - /* Vbus C1 sensing (10x voltage divider). PPVAR_USB_C1_VBUS */ - [ADC_VBUS_C1] = { - "VBUS_C1", NPCX_ADC_CH9, ADC_MAX_VOLT*10, ADC_READ_MAX+1, 0}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -194,12 +188,6 @@ const struct temp_sensor_t temp_sensors[] = { }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); -enum adc_channel board_get_vbus_adc(int port) -{ - return port ? ADC_VBUS_C1 : ADC_VBUS_C0; -} - - /* Motion sensors */ /* Mutexes */ static struct mutex g_lid_mutex; diff --git a/board/yorp/board.h b/board/yorp/board.h index 4ef2cd8aa0..db0904f8f5 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -62,8 +62,6 @@ enum adc_channel { ADC_TEMP_SENSOR_AMB, /* ADC0 */ ADC_TEMP_SENSOR_CHARGER, /* ADC1 */ - ADC_VBUS_C0, /* ADC4 */ - ADC_VBUS_C1, /* ADC9 */ ADC_CH_COUNT }; diff --git a/board/yorp/gpio.inc b/board/yorp/gpio.inc index 48b8aaea31..e041b0b176 100644 --- a/board/yorp/gpio.inc +++ b/board/yorp/gpio.inc @@ -141,6 +141,4 @@ 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, 0) /* I2C7 */ ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ -ALTERNATE(PIN_MASK(4, 0x02), 0, MODULE_ADC, 0) /* ADC4: ADC_USB_C0_VBUS */ -ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0) /* ADC9: ADC_USB_C1_VBUS */ ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* PWM3: KB_BL_PWM */