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>

12 files changed, 24 insertions, 62 deletions

diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c
index 37b467e005..7dc7c47e07 100644
--- a/baseboard/octopus/baseboard.c
+++ b/baseboard/octopus/baseboard.c
@@ -182,6 +182,18 @@ int board_is_i2c_port_powered(int port)
 /******************************************************************************/
 /* Power Delivery and charing functions */
 
+#ifdef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
+enum adc_channel board_get_vbus_adc(int port)
+{
+	if (port == 0)
+		return  ADC_VBUS_C0;
+	if (port == 1)
+		return  ADC_VBUS_C1;
+	CPRINTSUSB("Unknown vbus adc port id: %d", port);
+	return ADC_VBUS_C0;
+}
+#endif /* CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT */
+
 void baseboard_tcpc_init(void)
 {
 	int port;
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h
index af34b348a0..dace7bdbcf 100644
--- a/baseboard/octopus/baseboard.h
+++ b/baseboard/octopus/baseboard.h
@@ -195,7 +195,7 @@
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_VCONN
 #define CONFIG_USBC_VCONN_SWAP
-#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
+#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
 #define CONFIG_USB_PD_TCPM_MUX
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_BC12_DETECT_MAX14637
diff --git a/board/bobba/board.c b/board/bobba/board.c
index 4026a8507b..10ca4a526e 100644
--- a/board/bobba/board.c
+++ b/board/bobba/board.c
@@ -100,16 +100,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;
-	CPRINTSUSB("Unknown vbus adc port id: %d", port);
-	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/bobba/board.h b/board/bobba/board.h
index d3b36bce50..fd75ebe743 100644
--- a/board/bobba/board.h
+++ b/board/bobba/board.h
@@ -45,10 +45,6 @@
 #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL
 #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL
 
-/* USB PD */
-#undef CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
-#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
-
 #define CONFIG_VOLUME_BUTTONS
 #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL
 #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL
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 */
diff --git a/board/meep/board.c b/board/meep/board.c
index 82f5eefca9..24f1ac4d55 100644
--- a/board/meep/board.c
+++ b/board/meep/board.c
@@ -86,17 +86,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;
-
-	ccprints("Invaild VBUS adc channel!");
-	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/meep/board.h b/board/meep/board.h
index d40abe4146..c68dce6f53 100644
--- a/board/meep/board.h
+++ b/board/meep/board.h
@@ -33,10 +33,6 @@
 #define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL)
 #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT
 
-/* USB PD */
-#undef CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
-#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
-
 #define CONFIG_LID_ANGLE
 #define CONFIG_LID_ANGLE_UPDATE
 #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL
@@ -71,8 +67,8 @@
 enum adc_channel {
 	ADC_TEMP_SENSOR_AMB,		/* ADC0 */
 	ADC_TEMP_SENSOR_CHARGER,	/* ADC1 */
-	ADC_VBUS_C1,			/* ADC4 */
 	ADC_VBUS_C0,			/* ADC9 */
+	ADC_VBUS_C1,			/* ADC4 */
 	ADC_CH_COUNT
 };
 
diff --git a/board/phaser/board.c b/board/phaser/board.c
index 7680421a7b..4a525bb949 100644
--- a/board/phaser/board.c
+++ b/board/phaser/board.c
@@ -73,16 +73,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;
-	CPRINTSUSB("Unknown vbus adc port id: %d", port);
-	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/phaser/board.h b/board/phaser/board.h
index d1d60d0ea2..f507d6a949 100644
--- a/board/phaser/board.h
+++ b/board/phaser/board.h
@@ -13,10 +13,6 @@
 #define VARIANT_OCTOPUS_CHARGER_ISL9238
 #include "baseboard.h"
 
-/* USB PD */
-#undef CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
-#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
-
 #define CONFIG_VOLUME_BUTTONS
 #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL
 #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL
@@ -68,8 +64,8 @@
 enum adc_channel {
 	ADC_TEMP_SENSOR_AMB,		/* ADC0 */
 	ADC_TEMP_SENSOR_CHARGER,	/* ADC1 */
-	ADC_VBUS_C0,            /* ADC9 */
-	ADC_VBUS_C1,            /* ADC4 */
+	ADC_VBUS_C0,			/* ADC9 */
+	ADC_VBUS_C1,			/* ADC4 */
 	ADC_CH_COUNT,
 };
 
diff --git a/board/yorp/board.h b/board/yorp/board.h
index d11b8fc868..cad984afe4 100644
--- a/board/yorp/board.h
+++ b/board/yorp/board.h
@@ -19,6 +19,10 @@
 
 #define CONFIG_LED_COMMON
 
+/* USB PD */
+#undef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
+#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
+
 /* Sensors */
 #define CONFIG_ACCEL_KX022		/* Lid accel */
 #define CONFIG_ACCELGYRO_LSM6DSM	/* Base accel */