From 365d4312b09204699c53829185fadffd529fde3a Mon Sep 17 00:00:00 2001 From: Abe Levkoy Date: Fri, 25 Sep 2020 16:20:50 +0000 Subject: Revert "volteer: Move USB PID to board files" This reverts commit 6ed9b65ae38977118f0d5f02d6f5c61da23c5f24. Reason for revert: Historically, Octopus variants used the baseboard VID and PID. Original change's description: > volteer: Move USB PID to board files > > Add TODOs to update variants boards. > > BUG=none > TEST=make buildall > BRANCH=none > > Signed-off-by: Abe Levkoy > Change-Id: If0d8d0dd544c06114f355dcf281b2841a8397aee > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2417348 > Reviewed-by: Keith Short BUG=b:168826898,b:168827570,b:168827133,b:168827128,b:168827420 BUG=b:168827418,b:168826886,b:168826868,b:168827029,b:168826914 Change-Id: I5b9b1cee25e34a4b922fd604b49deabc9591b4e8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2431687 Tested-by: Abe Levkoy Reviewed-by: YH Lin Reviewed-by: Keith Short Commit-Queue: Abe Levkoy --- baseboard/volteer/baseboard.h | 7 +++++++ board/delbin/board.h | 2 -- board/eldrid/board.h | 2 -- board/halvor/board.h | 2 -- board/lindar/board.h | 2 -- board/lingcod/board.h | 2 -- board/malefor/board.h | 2 -- board/terrador/board.h | 2 -- board/todor/board.h | 2 -- board/trondo/board.h | 2 -- board/volteer/board.h | 7 ------- board/voxel/board.h | 2 -- 12 files changed, 7 insertions(+), 27 deletions(-) diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 004e85bcae..458bd7b300 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -216,6 +216,13 @@ /* UART COMMAND */ #define CONFIG_CMD_CHARGEN +/* + * USB ID + * This is allocated specifically for Volteer + * http://google3/hardware/standards/usb/ + */ +#define CONFIG_USB_PID 0x503E + /* Retimer */ #define CONFIG_USBC_RETIMER_INTEL_BB #define CONFIG_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG diff --git a/board/delbin/board.h b/board/delbin/board.h index a2b80aad0c..7b94edf039 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -53,8 +53,6 @@ #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL /* USB Type C and USB PD defines */ -/* TODO(b/168827128): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/eldrid/board.h b/board/eldrid/board.h index 9dcd6412d0..b7b0b62d95 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -57,8 +57,6 @@ #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL /* USB Type C and USB PD defines */ -/* TODO(b/168826914): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/halvor/board.h b/board/halvor/board.h index 6d01d8faf0..b1db5627fa 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -42,8 +42,6 @@ (BIT(LID_ACCEL) | BIT(CLEAR_ALS)) /* USB Type C and USB PD defines */ -/* TODO(b/168826868): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 3 /* diff --git a/board/lindar/board.h b/board/lindar/board.h index d8d05492e5..e749275e26 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -31,8 +31,6 @@ #undef CONFIG_MKBP_EVENT /* USB Type C and USB PD defines */ -/* TODO(b/168827029): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/lingcod/board.h b/board/lingcod/board.h index bf89a8a240..230b40fd84 100644 --- a/board/lingcod/board.h +++ b/board/lingcod/board.h @@ -43,8 +43,6 @@ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) /* USB Type C and USB PD defines */ -/* TODO(b/168827133): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/malefor/board.h b/board/malefor/board.h index 8d4e01e513..321fbc130f 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -43,8 +43,6 @@ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) /* USB Type C and USB PD defines */ -/* TODO(b/168826886): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/terrador/board.h b/board/terrador/board.h index 15924ab5e1..16c72663de 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -54,8 +54,6 @@ #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL /* USB Type C and USB PD defines */ -/* TODO(b/168827418): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/todor/board.h b/board/todor/board.h index d275869855..011fd8e359 100644 --- a/board/todor/board.h +++ b/board/todor/board.h @@ -54,8 +54,6 @@ #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL /* USB Type C and USB PD defines */ -/* TODO(b/168827570): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/trondo/board.h b/board/trondo/board.h index 7b87088711..c81bc1a5db 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -47,8 +47,6 @@ (BIT(LID_ACCEL) | BIT(CLEAR_ALS)) /* USB Type C and USB PD defines */ -/* TODO(b/168826898): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/volteer/board.h b/board/volteer/board.h index 793bb1a1a4..4aa02f6d6b 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -72,13 +72,6 @@ #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL /* USB Type C and USB PD defines */ -/* - * USB ID - * This is allocated specifically for Volteer - * http://google3/hardware/standards/usb/ - */ -#define CONFIG_USB_PID 0x503E - #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* diff --git a/board/voxel/board.h b/board/voxel/board.h index df346741b4..9f81e1da5b 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -52,8 +52,6 @@ #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL /* USB Type C and USB PD defines */ -/* TODO(b/168826898): Don't use Volteer PID. */ -#define CONFIG_USB_PID 0x503E #define CONFIG_USB_PD_PORT_MAX_COUNT 2 /* -- cgit v1.2.1