diff options
Diffstat (limited to 'board/pompom')
-rw-r--r-- | board/pompom/board.c | 38 | ||||
-rw-r--r-- | board/pompom/board.h | 1 | ||||
-rw-r--r-- | board/pompom/ec.tasklist | 5 | ||||
-rw-r--r-- | board/pompom/gpio.inc | 8 |
4 files changed, 3 insertions, 49 deletions
diff --git a/board/pompom/board.c b/board/pompom/board.c index 0435cab719..2fa423124d 100644 --- a/board/pompom/board.c +++ b/board/pompom/board.c @@ -37,7 +37,6 @@ /* Forward declaration */ static void tcpc_alert_event(enum gpio_signal signal); static void usb0_evt(enum gpio_signal signal); -static void usb1_evt(enum gpio_signal signal); static void ppc_interrupt(enum gpio_signal signal); static void board_connect_c0_sbu(enum gpio_signal s); @@ -52,9 +51,6 @@ static void tcpc_alert_event(enum gpio_signal signal) case GPIO_USB_C0_PD_INT_ODL: port = 0; break; - case GPIO_USB_C1_PD_INT_ODL: - port = 1; - break; default: return; } @@ -67,20 +63,12 @@ static void usb0_evt(enum gpio_signal signal) task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12, 0); } -static void usb1_evt(enum gpio_signal signal) -{ - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12, 0); -} - static void ppc_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_SWCTL_INT_ODL: sn5s330_interrupt(0); break; - case GPIO_USB_C1_SWCTL_INT_ODL: - sn5s330_interrupt(1); - break; default: break; } @@ -152,11 +140,6 @@ struct ppc_config_t ppc_chips[] = { .i2c_addr_flags = SN5S330_ADDR0_FLAGS, .drv = &sn5s330_drv }, - { - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = SN5S330_ADDR0_FLAGS, - .drv = &sn5s330_drv - }, }; unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); @@ -170,14 +153,6 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, .drv = &ps8xxx_tcpm_drv, }, - { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = I2C_PORT_TCPC1, - .addr_flags = PS8751_I2C_ADDR1_FLAGS, - }, - .drv = &ps8xxx_tcpm_drv, - }, }; /* @@ -193,11 +168,6 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { .driver = &tcpci_tcpm_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, }, - { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - } }; const int usb_port_enable[USB_PORT_COUNT] = { @@ -221,11 +191,9 @@ static void board_init(void) { /* Enable BC1.2 VBUS detection */ gpio_enable_interrupt(GPIO_USB_C0_VBUS_DET_L); - gpio_enable_interrupt(GPIO_USB_C1_VBUS_DET_L); /* Enable BC1.2 interrupts */ gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_L); - gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L); /* Enable interrupt for BMI160 sensor */ gpio_enable_interrupt(GPIO_ACCEL_GYRO_INT_L); @@ -255,7 +223,6 @@ void board_tcpc_init(void) /* Enable TCPC interrupts */ gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); /* * Initialize HPD to low; after sysjump SOC needs to see @@ -309,10 +276,8 @@ void board_reset_pd_mcu(void) cflush(); gpio_set_level(GPIO_USB_C0_PD_RST_L, 0); - gpio_set_level(GPIO_USB_C1_PD_RST_L, 0); msleep(PS8XXX_RESET_DELAY_MS); gpio_set_level(GPIO_USB_C0_PD_RST_L, 1); - gpio_set_level(GPIO_USB_C1_PD_RST_L, 1); } void board_set_tcpc_power_mode(int port, int mode) @@ -423,9 +388,6 @@ uint16_t tcpc_get_alert_status(void) if (!gpio_get_level(GPIO_USB_C0_PD_INT_ODL)) if (gpio_get_level(GPIO_USB_C0_PD_RST_L)) status |= PD_STATUS_TCPC_ALERT_0; - if (!gpio_get_level(GPIO_USB_C1_PD_INT_ODL)) - if (gpio_get_level(GPIO_USB_C1_PD_RST_L)) - status |= PD_STATUS_TCPC_ALERT_1; return status; } diff --git a/board/pompom/board.h b/board/pompom/board.h index f4f2feeacf..dbefef734d 100644 --- a/board/pompom/board.h +++ b/board/pompom/board.h @@ -28,6 +28,7 @@ /* USB */ #define CONFIG_USB_PD_TCPM_PS8751 #define CONFIG_USBC_PPC_SN5S330 +#define CONFIG_USB_PD_PORT_MAX_COUNT 1 /* USB-A */ #define USB_PORT_COUNT 1 diff --git a/board/pompom/ec.tasklist b/board/pompom/ec.tasklist index 2b55c26c20..7ec8b46059 100644 --- a/board/pompom/ec.tasklist +++ b/board/pompom/ec.tasklist @@ -10,7 +10,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, ULTRA_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P1, usb_charger_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, ULTRA_TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, ULTRA_TASK_STACK_SIZE) \ TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ @@ -18,6 +17,4 @@ TASK_ALWAYS(CONSOLE, console_task, NULL, ULTRA_TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(PD_C0, pd_task, NULL, ULTRA_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C1, pd_task, NULL, ULTRA_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, ULTRA_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, ULTRA_TASK_STACK_SIZE) + TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, ULTRA_TASK_STACK_SIZE) diff --git a/board/pompom/gpio.inc b/board/pompom/gpio.inc index 239da6222d..70d210b670 100644 --- a/board/pompom/gpio.inc +++ b/board/pompom/gpio.inc @@ -10,11 +10,8 @@ /* USB-C interrupts */ GPIO_INT(USB_C0_PD_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-0 TCPC */ -GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-1 TCPC */ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-0 PPC */ -GPIO_INT(USB_C1_SWCTL_INT_ODL, PIN(4, 0), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-1 PPC */ GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING, usb0_evt) /* Interrupt from port-0 BC1.2 */ -GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING, usb1_evt) /* Interrupt from port-1 BC1.2 */ /* System interrupts */ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) /* AC OK? */ @@ -79,14 +76,13 @@ GPIO(TRACKPAD_INT_GATE, PIN(7, 4), GPIO_OUT_LOW) /* USB-C */ GPIO(USB_C0_PD_RST_L, PIN(F, 1), GPIO_OUT_HIGH) /* Port-0 TCPC chip reset */ -GPIO(USB_C1_PD_RST_L, PIN(E, 4), GPIO_OUT_HIGH) /* Port-1 TCPC chip reset */ GPIO(DP_MUX_OE_L, PIN(9, 6), GPIO_OUT_HIGH) /* DP mux enable */ GPIO(DP_MUX_SEL, PIN(4, 5), GPIO_OUT_HIGH) /* DP mux selection: L:C0, H:C1 */ GPIO(DP_HOT_PLUG_DET, PIN(9, 5), GPIO_OUT_LOW) /* DP HPD to AP */ /* TODO(waihong): Remove it from schematic. No use. */ GPIO(USBC_MUX_CONF0, PIN(5, 1), GPIO_INPUT) GPIO(USB_C0_VBUS_DET_L, PIN(6, 2), GPIO_INPUT) /* Deprecated BC1.2 VBUS detection on port-0 */ -GPIO(USB_C1_VBUS_DET_L, PIN(8, 3), GPIO_INPUT) /* Deprecated BC1.2 VBUS detection on port-1 */ + /* USB-A */ GPIO(EN_USB_A_5V, PIN(8, 6), GPIO_OUT_LOW) @@ -112,8 +108,6 @@ GPIO(EC_I2C_POWER_SCL, PIN(B, 5), GPIO_INPUT) GPIO(EC_I2C_POWER_SDA, PIN(B, 4), GPIO_INPUT) GPIO(EC_I2C_USB_C0_PD_SCL, PIN(9, 0), GPIO_INPUT) GPIO(EC_I2C_USB_C0_PD_SDA, PIN(8, 7), GPIO_INPUT) -GPIO(EC_I2C_USB_C1_PD_SCL, PIN(9, 2), GPIO_INPUT) -GPIO(EC_I2C_USB_C1_PD_SDA, PIN(9, 1), GPIO_INPUT) GPIO(EC_I2C_EEPROM_SCL, PIN(3, 3), GPIO_INPUT) GPIO(EC_I2C_EEPROM_SDA, PIN(3, 6), GPIO_INPUT) GPIO(EC_I2C_SENSOR_SCL, PIN(B, 3), GPIO_INPUT | GPIO_SEL_1P8V) |