diff options
| -rw-r--r-- | board/eldrid/board.c | 13 | ||||
| -rw-r--r-- | board/eldrid/gpio.inc | 9 |
2 files changed, 2 insertions, 20 deletions
diff --git a/board/eldrid/board.c b/board/eldrid/board.c index 14b528c214..36dc137516 100644 --- a/board/eldrid/board.c +++ b/board/eldrid/board.c @@ -51,7 +51,7 @@ * FW_CONFIG defaults for Volteer if the CBI data is not initialized. */ union volteer_cbi_fw_config fw_config_defaults = { - .usb_db = DB_USB4_GEN2, + .usb_db = DB_USB3_ACTIVE, }; static void board_init(void) @@ -361,17 +361,6 @@ __override void board_cbi_init(void) { enum ec_cfg_usb_db_type usb_db = ec_cfg_usb_db_type(); - /* Reconfigure Volteer GPIOs based on the board ID */ - if (get_board_id() == 0) { - CPRINTS("Configuring GPIOs for board ID 0"); - CPRINTS("VOLUME_UP button disabled"); - - /* Reassign USB_C1_RT_RST_ODL */ - bb_controls[USBC_PORT_C1].retimer_rst_gpio = - GPIO_USB_C1_RT_RST_ODL_BOARDID_0; - ps8xxx_rst_odl = GPIO_USB_C1_RT_RST_ODL_BOARDID_0; - } - switch (usb_db) { case DB_USB_ABSENT: CPRINTS("%sNone", db_type_prefix); diff --git a/board/eldrid/gpio.inc b/board/eldrid/gpio.inc index d0055671ca..4435934c74 100644 --- a/board/eldrid/gpio.inc +++ b/board/eldrid/gpio.inc @@ -85,14 +85,7 @@ GPIO(EC_PCH_INT_ODL, PIN(B, 0), GPIO_ODR_HIGH) GPIO(EN_PP5000_USBA, PIN(C, 6), GPIO_OUT_LOW) /* Enable USB-A charging - all ports */ GPIO(USB_A_LOW_PWR_OD, PIN(6, 6), GPIO_ODR_LOW) /* Don't limit USB-A charging by default - all ports */ -/* - * USB_C1 moved from GPIO32 to GPIO83 on boards with board ID >=1. - * GPIO83/EN_PP1800_A is DNS on board ID 0 and GPIO32 is N/C on board ID >=1 - * so it's safe to define GPIOs compatible with both designs. - * TODO (b/149858568): remove board ID=0 support. - */ -GPIO(USB_C1_RT_RST_ODL_BOARDID_0, PIN(3, 2), GPIO_ODR_LOW) /* USB_C1 Reset on boards without board ID */ -GPIO(USB_C1_RT_RST_ODL, PIN(8, 3), GPIO_ODR_LOW) /* USB_C1 Reset on boards board ID >=1 */ +GPIO(USB_C1_RT_RST_ODL, PIN(8, 3), GPIO_ODR_LOW) GPIO(USB_C0_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) GPIO(USB_C1_OC_ODL, PIN(5, 0), GPIO_ODR_HIGH) /* There is currently no need to service this interrupt. */ |