boxy: Modify GPIO table

Modify Boxy GPIO table.
Remove HDMI2, USBA1, USBA2 define in board.c.

BUG=b:279669971
BRANCH=None
TEST=make -j BOARD=boxy

Change-Id: Ieb9a71abb34d055f1d4e7eb6ad5835f8d9adc4c4
Signed-off-by: jimmy.wu <jimmy.wu@lcfc.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4480651
Reviewed-by: Derek Huang <derekhuang@google.com>

2 files changed, 17 insertions, 49 deletions

diff --git a/board/boxy/board.c b/board/boxy/board.c
index 134eece8cc..e9cd9fb227 100644
--- a/board/boxy/board.c
+++ b/board/boxy/board.c
@@ -85,7 +85,6 @@ struct ppc_config_t ppc_chips[] = {
 	[USBC_PORT_C0] = {
 		.i2c_port = I2C_PORT_USB_C0,
 		.i2c_addr_flags = SYV682X_ADDR0_FLAGS,
-		.frs_en = GPIO_EC_USB_C0_FRS_EN,
 		.drv = &syv682x_drv,
 	},
 };
@@ -110,8 +109,6 @@ const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = {
 const int usb_port_enable[USB_PORT_COUNT] = {
 	GPIO_EN_USB_A0_VBUS,
 	GPIO_EN_USB_A1_VBUS,
-	GPIO_EN_USB_A2_VBUS,
-	GPIO_EN_USB_A3_VBUS,
 };
 
 /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
@@ -300,14 +297,6 @@ int board_set_active_charge_port(int port)
 	switch (port) {
 	case CHARGE_PORT_TYPEC0:
 		ppc_vbus_sink_enable(USBC_PORT_C0, 1);
-		gpio_set_level(GPIO_EN_PPVAR_BJ_ADP_OD, 0);
-		break;
-	case CHARGE_PORT_BARRELJACK:
-		/* Make sure BJ adapter is sourcing power */
-		if (!gpio_get_level(GPIO_BJ_ADP_PRESENT))
-			return EC_ERROR_INVAL;
-		gpio_set_level(GPIO_EN_PPVAR_BJ_ADP_OD, 1);
-		ppc_vbus_sink_enable(USBC_PORT_C0, 1);
 		break;
 	default:
 		return EC_ERROR_INVAL;
@@ -374,24 +363,12 @@ const struct i2c_port_t i2c_ports[] = {
 	  .scl = GPIO_EC_I2C_EEPROM_SCL,
 	  .sda = GPIO_EC_I2C_EEPROM_SDA },
 
-	{ .name = "hdmi2_edid",
-	  .port = I2C_PORT_HDMI2_EDID,
-	  .kbps = 100,
-	  .scl = GPIO_EC_I2C_HDMI2_EDID_SCL,
-	  .sda = GPIO_EC_I2C_HDMI2_EDID_SDA },
-
 	{ .name = "usbc0",
 	  .port = I2C_PORT_USB_C0,
 	  .kbps = 1000,
 	  .scl = GPIO_EC_I2C_USB_C0_SCL,
 	  .sda = GPIO_EC_I2C_USB_C0_SDA },
 
-	{ .name = "hdmi2_src_ddc",
-	  .port = I2C_PORT_HDMI2_SRC_DDC,
-	  .kbps = 100,
-	  .scl = GPIO_EC_I2C_HDMI2_SRC_DDC_SCL,
-	  .sda = GPIO_EC_I2C_HDMI2_SRC_DDC_SDA },
-
 	{ .name = "hdmi1_edid",
 	  .port = I2C_PORT_HDMI1_EDID,
 	  .kbps = 100,
diff --git a/board/boxy/gpio.inc b/board/boxy/gpio.inc
index 0e5d0ba917..f1e49964ae 100644
--- a/board/boxy/gpio.inc
+++ b/board/boxy/gpio.inc
@@ -45,6 +45,7 @@ GPIO_INT(EC_RECOVERY_BTN_OD, PIN(K, 7), GPIO_INT_BOTH, button_interrupt)
 GPIO_INT(H1_EC_RECOVERY_BTN_ODL, PIN(K, 4), GPIO_INT_BOTH, button_interrupt)
 GPIO_INT(BJ_ADP_PRESENT, PIN(A, 7), GPIO_INT_BOTH, adp_connect_interrupt)
 GPIO_INT(USB_C0_FAULT_L, PIN(K, 0), GPIO_INT_FALLING, ppc_interrupt)
+GPIO_INT(USB_C1_FAULT_L, PIN(K, 3), GPIO_INT_FALLING, ppc_interrupt)
 
 /* Power sequence GPIOs */
 GPIO(EC_AP_PSYS, PIN(J, 2), GPIO_OUT_LOW)
@@ -66,8 +67,6 @@ GPIO(EN_VCCIO_EXT, PIN(B, 2), GPIO_OUT_LOW)
 GPIO(EC_PROCHOT_ODL, PIN(I, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
 GPIO(EC_AP_VCCST_PWRGD_OD, PIN(E, 5), GPIO_ODR_LOW)
 GPIO(ALL_SYS_PWRGD, PIN(B, 7), GPIO_OUT_LOW)
-GPIO(EN_PPVAR_BJ_ADP_OD, PIN(E, 3), GPIO_ODR_HIGH)
-GPIO(ACK_PPVAR_BJ_ADP_ODL, PIN(A, 0), GPIO_INPUT)
 
 /* Required for icelake chipset code, but implemented through other means for
  * dedede */
@@ -85,22 +84,18 @@ GPIO(EC_I2C_EEPROM_SCL, PIN(B, 3), GPIO_INPUT)
 GPIO(EC_I2C_EEPROM_SDA, PIN(B, 4), GPIO_INPUT)
 GPIO(EC_I2C_USB_C0_SCL, PIN(F, 6), GPIO_INPUT)
 GPIO(EC_I2C_USB_C0_SDA, PIN(F, 7), GPIO_INPUT)
+GPIO(EC_I2C_USB_C1_SCL, PIN(C, 1), GPIO_INPUT)
+GPIO(EC_I2C_USB_C1_SDA, PIN(C, 2), GPIO_INPUT)
 GPIO(EC_I2C_HDMI1_EDID_SCL, PIN(E, 0), GPIO_INPUT)
 GPIO(EC_I2C_HDMI1_EDID_SDA, PIN(E, 7), GPIO_INPUT)
-GPIO(EC_I2C_HDMI2_EDID_SCL, PIN(C, 1), GPIO_INPUT)
-GPIO(EC_I2C_HDMI2_EDID_SDA, PIN(C, 2), GPIO_INPUT)
 GPIO(EC_I2C_HDMI1_SRC_DDC_SCL, PIN(A, 4), GPIO_INPUT)
 GPIO(EC_I2C_HDMI1_SRC_DDC_SDA, PIN(A, 5), GPIO_INPUT)
-GPIO(EC_I2C_HDMI2_SRC_DDC_SCL, PIN(H, 1), GPIO_INPUT)
-GPIO(EC_I2C_HDMI2_SRC_DDC_SDA, PIN(H, 2), GPIO_INPUT)
 
 /* USB pins */
 GPIO(EC_AP_USB_C0_HPD, PIN(L, 4), GPIO_OUT_LOW)
+GPIO(EC_AP_USB_C1_HPD, PIN(J, 6), GPIO_OUT_LOW)
 GPIO(EN_USB_A0_VBUS, PIN(L, 6), GPIO_OUT_LOW)
 GPIO(EN_USB_A1_VBUS, PIN(C, 6), GPIO_OUT_LOW)
-GPIO(EN_USB_A2_VBUS, PIN(C, 4), GPIO_OUT_LOW)
-GPIO(EN_USB_A3_VBUS, PIN(J, 5), GPIO_OUT_LOW)
-GPIO(EC_USB_C0_FRS_EN, PIN(K, 6), GPIO_OUT_LOW)
 GPIO(USB_C0_SBU_MUX_FAULT, PIN(I, 7), GPIO_INPUT)
 
 /* MKBP event synchronization */
@@ -109,23 +104,16 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
 
 /* HDMI */
 GPIO(HDMI1_CEC, PIN(F, 0), GPIO_OUT_LOW)
-GPIO(HDMI2_CEC_IN, PIN(J, 3), GPIO_INPUT)
-GPIO(HDMI2_CEC, PIN(F, 1), GPIO_OUT_LOW)
 GPIO(HDMI1_SRC_HPD, PIN(F, 3), GPIO_INPUT)
-GPIO(HDMI2_SRC_HPD, PIN(KSO_L, 3), GPIO_INPUT)
-GPIO(EC_HDMI1_SRC_HPD_OUT, PIN(I, 6), GPIO_OUT_LOW)
-GPIO(EC_HDMI2_SRC_HPD_OUT, PIN(KSO_L, 4), GPIO_OUT_LOW)
+GPIO(EC_HDMI1_SRC_HPD_OUT, PIN(K, 6), GPIO_OUT_LOW)
 GPIO(HDMI1_EDID_SEL, PIN(J, 1), GPIO_OUT_LOW)
-GPIO(HDMI2_EDID_SEL, PIN(KSO_L, 5), GPIO_OUT_LOW)
-GPIO(EDID_BTN_ODL, PIN(C, 3), GPIO_INPUT)
+GPIO(EDID_BTN_ODL, PIN(C, 3), GPIO_INPUT | GPIO_PULL_UP)
 GPIO(EC_EN_PP5000_HDMI1, PIN(KSO_L, 6), GPIO_OUT_LOW)
-GPIO(EC_EN_PP5000_HDMI2, PIN(KSO_L, 7), GPIO_OUT_LOW)
 
 /* Misc */
 GPIO(EC_ENTERING_RW, PIN(C, 7), GPIO_OUT_LOW)
 GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
 GPIO(ECH1_PACKET_MODE, PIN(C, 0), GPIO_OUT_LOW)
-GPIO(EN_RS232_X, PIN(E, 6), GPIO_OUT_LOW)
 GPIO(UART0_RX, PIN(B, 1), GPIO_OUT_LOW) /* UART_EC_TX_DBG_RX */
 
 /* NC pins, enable internal pull-down to avoid floating state. */
@@ -135,13 +123,19 @@ GPIO(GPIOG4_NC, PIN(G, 4), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOG5_NC, PIN(G, 5), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOG6_NC, PIN(G, 6), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOG7_NC, PIN(G, 7), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(GPIOH4_NC, PIN(H, 4), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOH6_NC, PIN(H, 6), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOI4_NC, PIN(I, 4), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOJ4_NC, PIN(J, 4), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(GPIOJ6_NC, PIN(J, 6), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(GPIOK3_NC, PIN(K, 3), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(GPIOM6_NC, PIN(M, 6), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOJ5_NC, PIN(J, 5), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOE3_NC, PIN(E, 3), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOF1_NC, PIN(F, 1), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOE6_NC, PIN(E, 6), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOC4_NC, PIN(C, 4), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOI6_NC, PIN(I, 6), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOA0_NC, PIN(A, 0), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOJ3_NC, PIN(J, 3), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(GPIOH4_NC, PIN(H, 4), GPIO_INPUT | GPIO_PULL_DOWN)
 
 /* Alternate functions GPIO definitions */
 /* UART */
@@ -149,15 +143,12 @@ ALTERNATE(PIN_MASK(B, BIT(0) | BIT(1)), 0, MODULE_UART, 0) /* UART for debug */
 
 /* I2C */
 ALTERNATE(PIN_MASK(B, BIT(3) | BIT(4)), 0, MODULE_I2C, 0) /* I2C0 - EEPROM */
-ALTERNATE(PIN_MASK(C, BIT(1) | BIT(2)), 0, MODULE_I2C, 0) /* I2C1 - HDMI2_EDID
-							   */
+ALTERNATE(PIN_MASK(C, BIT(1) | BIT(2)), 0, MODULE_I2C, 0) /* I2C1 - USB_C1*/
 ALTERNATE(PIN_MASK(F, BIT(6) | BIT(7)), 0, MODULE_I2C, 0) /* I2C2 - USB_C0 */
 ALTERNATE(PIN_MASK(E, BIT(0) | BIT(7)), 0, MODULE_I2C, 0) /* I2C4 - HDMI1_EDID
 							   */
 ALTERNATE(PIN_MASK(A, BIT(4) | BIT(5)), 0, MODULE_I2C, 0) /* I2C5 -
 							     HDMI1_SRC_DDC */
-ALTERNATE(PIN_MASK(H, BIT(1) | BIT(2)), 0, MODULE_I2C, 0) /* I2C3 -
-							     HDMI2_SRC_DDC */
 
 /* ADC */
 ALTERNATE(PIN_MASK(I, BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC2:
@@ -176,4 +167,4 @@ ALTERNATE(PIN_MASK(L, BIT(0) | BIT(2) | BIT(3)), 0, MODULE_ADC,
 /* PWM */
 ALTERNATE(PIN_MASK(A, BIT(1) | BIT(2) | BIT(3)), 0, MODULE_PWM,
 	  0) /* LED_[R,G,B]_ODL
-	      */
+	      */
\ No newline at end of file