vell: Remove unused daughter-board types

Vell only has one daughter-board type. Remove other unused types.

BUG=b:186907625
BRANCH=none
TEST=make BOARD=vell

Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: I5d81b91eb396d8aa7bfa3c3b18c186a89889c03b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3276017
Reviewed-by: caveh jalali <caveh@chromium.org>

3 files changed, 12 insertions, 49 deletions

diff --git a/board/vell/board.c b/board/vell/board.c
index fd31401495..cb060442a2 100644
--- a/board/vell/board.c
+++ b/board/vell/board.c
@@ -33,11 +33,6 @@
 #define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
 
-__override void board_cbi_init(void)
-{
-	config_usb_db_type();
-}
-
 /* Called on AP S3 -> S0 transition */
 static void board_chipset_resume(void)
 {
diff --git a/board/vell/usbc_config.c b/board/vell/usbc_config.c
index 81c1a28959..ba50928dd2 100644
--- a/board/vell/usbc_config.c
+++ b/board/vell/usbc_config.c
@@ -250,17 +250,6 @@ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state)
 
 #endif /* CONFIG_CHARGE_RAMP_SW */
 
-void config_usb_db_type(void)
-{
-	enum ec_cfg_usb_db_type db_type = ec_cfg_usb_db_type();
-
-	/*
-	 * TODO(b/180434685): implement multiple DB types
-	 */
-
-	CPRINTS("Configured USB DB type number is %d", db_type);
-}
-
 __override int bb_retimer_power_enable(const struct usb_mux *me, bool enable)
 {
 	enum ioex_signal rst_signal;
@@ -300,14 +289,12 @@ __override int bb_retimer_power_enable(const struct usb_mux *me, bool enable)
 void board_reset_pd_mcu(void)
 {
 	/*
-	 * TODO(b/179648104): figure out correct timing
+	 * TODO(b/203371200): figure out correct timing
 	 */
 
 	gpio_set_level(GPIO_USB_C0_C2_TCPC_RST_ODL, 0);
-	if (ec_cfg_usb_db_type() != DB_USB_ABSENT) {
-		gpio_set_level(GPIO_USB_C1_RST_ODL, 0);
-		gpio_set_level(GPIO_USB_C1_RT_RST_R_ODL, 0);
-	}
+	gpio_set_level(GPIO_USB_C1_RST_ODL, 0);
+	gpio_set_level(GPIO_USB_C1_RT_RST_R_ODL, 0);
 
 	/*
 	 * delay for power-on to reset-off and min. assertion time
@@ -316,10 +303,8 @@ void board_reset_pd_mcu(void)
 	msleep(20);
 
 	gpio_set_level(GPIO_USB_C0_C2_TCPC_RST_ODL, 1);
-	if (ec_cfg_usb_db_type() != DB_USB_ABSENT) {
-		gpio_set_level(GPIO_USB_C1_RST_ODL, 1);
-		gpio_set_level(GPIO_USB_C1_RT_RST_R_ODL, 1);
-	}
+	gpio_set_level(GPIO_USB_C1_RST_ODL, 1);
+	gpio_set_level(GPIO_USB_C1_RT_RST_R_ODL, 1);
 
 	/* wait for chips to come up */
 
@@ -357,11 +342,9 @@ static void board_tcpc_init(void)
 	gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL);
 	gpio_enable_interrupt(GPIO_USB_C2_BC12_INT_ODL);
 
-	if (ec_cfg_usb_db_type() != DB_USB_ABSENT) {
-		gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL);
-		gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL);
-		gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL);
-	}
+	gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL);
+	gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL);
+	gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL);
 }
 DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_CHIPSET);
 
@@ -372,8 +355,7 @@ uint16_t tcpc_get_alert_status(void)
 	if (gpio_get_level(GPIO_USB_C0_C2_TCPC_INT_ODL) == 0)
 		status |= PD_STATUS_TCPC_ALERT_0 | PD_STATUS_TCPC_ALERT_2;
 
-	if ((ec_cfg_usb_db_type() != DB_USB_ABSENT) &&
-	    gpio_get_level(GPIO_USB_C1_TCPC_INT_ODL) == 0)
+	if (gpio_get_level(GPIO_USB_C1_TCPC_INT_ODL) == 0)
 		status |= PD_STATUS_TCPC_ALERT_1;
 
 	return status;
@@ -383,8 +365,7 @@ int ppc_get_alert_status(int port)
 {
 	if (port == USBC_PORT_C0)
 		return gpio_get_level(GPIO_USB_C0_PPC_INT_ODL) == 0;
-	else if ((port == USBC_PORT_C1) &&
-		 (ec_cfg_usb_db_type() != DB_USB_ABSENT))
+	else if (port == USBC_PORT_C1)
 		return gpio_get_level(GPIO_USB_C1_PPC_INT_ODL) == 0;
 	else if (port == USBC_PORT_C2)
 		return gpio_get_level(GPIO_USB_C2_PPC_INT_ODL) == 0;
@@ -398,8 +379,6 @@ void tcpc_alert_event(enum gpio_signal signal)
 		schedule_deferred_pd_interrupt(USBC_PORT_C0);
 		break;
 	case GPIO_USB_C1_TCPC_INT_ODL:
-		if (ec_cfg_usb_db_type() == DB_USB_ABSENT)
-			break;
 		schedule_deferred_pd_interrupt(USBC_PORT_C1);
 		break;
 	default:
@@ -414,8 +393,6 @@ void bc12_interrupt(enum gpio_signal signal)
 		task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12);
 		break;
 	case GPIO_USB_C1_BC12_INT_ODL:
-		if (ec_cfg_usb_db_type() == DB_USB_ABSENT)
-			break;
 		task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12);
 		break;
 	case GPIO_USB_C2_BC12_INT_ODL:
@@ -433,14 +410,7 @@ void ppc_interrupt(enum gpio_signal signal)
 		syv682x_interrupt(USBC_PORT_C0);
 		break;
 	case GPIO_USB_C1_PPC_INT_ODL:
-		switch (ec_cfg_usb_db_type()) {
-		case DB_USB_ABSENT:
-		case DB_USB_ABSENT2:
-			break;
-		case DB_USB3_PS8815:
-			nx20p348x_interrupt(USBC_PORT_C1);
-			break;
-		}
+		nx20p348x_interrupt(USBC_PORT_C1);
 		break;
 	case GPIO_USB_C2_PPC_INT_ODL:
 		syv682x_interrupt(USBC_PORT_C2);
diff --git a/board/vell/usbc_config.h b/board/vell/usbc_config.h
index 5d08a446fb..f21e2c17dc 100644
--- a/board/vell/usbc_config.h
+++ b/board/vell/usbc_config.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* Brya board-specific USB-C configuration */
+/* Vell board-specific USB-C configuration */
 
 #ifndef __CROS_EC_USBC_CONFIG_H
 #define __CROS_EC_USBC_CONFIG_H
@@ -17,6 +17,4 @@ enum usbc_port {
 	USBC_PORT_COUNT
 };
 
-void config_usb_db_type(void);
-
 #endif /* __CROS_EC_USBC_CONFIG_H */