diff options
author | johnwc_yeh <johnwc_yeh@compal.corp-partner.google.com> | 2021-08-19 14:40:00 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-08-19 18:51:33 +0000 |
commit | 4d6836806b80bdcbb943294285ba77b024b7a22b (patch) | |
tree | 1294b629024fe7147a61dc3baea0a053b7de96e8 | |
parent | b6df95c03b050c464b66991c945071b28682083d (diff) | |
download | chrome-ec-4d6836806b80bdcbb943294285ba77b024b7a22b.tar.gz |
Corori: Removed PD port 1 configuration
Due to corori only support a USB PD port 0 on MB side, so remove the
PD port 1 configuration in board layer.
BUG=b:197044392
BRANCH=keeby
TEST=make BOARD=corori
Signed-off-by: johnwc_yeh <johnwc_yeh@compal.corp-partner.google.com>
Change-Id: I8627ac564a75b111ec65a1a6af72d01e3e8c62af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3105913
Tested-by: Matt Wang <matt_wang@compal.corp-partner.google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Elmo Lan <elmo_lan@compal.corp-partner.google.com>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r-- | board/corori/board.c | 93 | ||||
-rw-r--r-- | board/corori/board.h | 15 | ||||
-rw-r--r-- | board/corori/ec.tasklist | 5 | ||||
-rw-r--r-- | board/corori/gpio.inc | 1 |
4 files changed, 2 insertions, 112 deletions
diff --git a/board/corori/board.c b/board/corori/board.c index c7f6bb2b05..68af291660 100644 --- a/board/corori/board.c +++ b/board/corori/board.c @@ -28,7 +28,6 @@ #include "driver/tcpm/raa489000.h" #include "driver/tcpm/tcpci.h" #include "driver/usb_mux/pi3usb3x532.h" -#include "driver/retimer/ps8802.h" #include "extpower.h" #include "gpio.h" #include "hooks.h" @@ -61,9 +60,6 @@ static uint8_t new_adc_key_state; -static void ps8762_chaddr_deferred(void); -DECLARE_DEFERRED(ps8762_chaddr_deferred); - /******************************************************************************/ /* USB-A Configuration */ const int usb_port_enable[USB_PORT_COUNT] = { @@ -155,40 +151,6 @@ static void usb_c0_interrupt(enum gpio_signal s) } -/* C1 interrupt line shared by BC 1.2, TCPC, and charger */ -static void check_c1_line(void); -DECLARE_DEFERRED(check_c1_line); - -static void notify_c1_chips(void) -{ - schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); -} - -static void check_c1_line(void) -{ - /* - * If line is still being held low, see if there's more to process from - * one of the chips. - */ - if (!gpio_get_level(GPIO_SUB_USB_C1_INT_ODL)) { - notify_c1_chips(); - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); - } -} - -static void sub_usb_c1_interrupt(enum gpio_signal s) -{ - /* Cancel any previous calls to check the interrupt line */ - hook_call_deferred(&check_c1_line_data, -1); - - /* Notify all chips using this line that an interrupt came in */ - notify_c1_chips(); - - /* Check the line again in 5ms */ - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); -} - #include "gpio_list.h" /* ADC channels */ @@ -289,15 +251,6 @@ void board_reset_pd_mcu(void) */ } -static void ps8762_chaddr_deferred(void) -{ - /* Switch PS8762 I2C Address to 0x50*/ - if (ps8802_chg_i2c_addr(I2C_PORT_SUB_USB_C1) == EC_SUCCESS) - CPRINTS("Switch PS8762 address to 0x50 success"); - else - CPRINTS("Switch PS8762 address to 0x50 failed"); -} - __override void board_power_5v_enable(int enable) { /* @@ -311,11 +264,6 @@ __override void board_power_5v_enable(int enable) if (!enable) return; - /* - * Port C1 the PP3300_USB_C1 assert, delay 15ms - * colud be accessed PS8762 by I2C. - */ - hook_call_deferred(&ps8762_chaddr_deferred_data, 15 * MSEC); } int board_is_sourcing_vbus(int port) @@ -595,9 +543,7 @@ void board_init(void) int on; gpio_enable_interrupt(GPIO_USB_C0_INT_ODL); - gpio_enable_interrupt(GPIO_SUB_USB_C1_INT_ODL); check_c0_line(); - check_c1_line(); /* Enable gpio interrupt for base accelgyro sensor */ gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); @@ -672,12 +618,6 @@ const struct charger_config_t chg_chips[] = { .i2c_addr_flags = ISL923X_ADDR_FLAGS, .drv = &isl923x_drv, }, - - { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, - }, }; const unsigned int chg_cnt = ARRAY_SIZE(chg_chips); @@ -687,12 +627,6 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, .flags = PI3USB9201_ALWAYS_POWERED, }, - - { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, - .flags = PI3USB9201_ALWAYS_POWERED, - }, }; /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ @@ -715,16 +649,6 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .flags = TCPC_FLAGS_TCPCI_REV2_0, .drv = &raa489000_tcpm_drv, }, - - { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = I2C_PORT_SUB_USB_C1, - .addr_flags = RAA489000_TCPC0_I2C_FLAGS, - }, - .flags = TCPC_FLAGS_TCPCI_REV2_0, - .drv = &raa489000_tcpm_drv, - }, }; const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { @@ -734,12 +658,6 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, .driver = &pi3usb3x532_usb_mux_driver, }, - { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, - .driver = &ps8802_usb_mux_driver, - } }; uint16_t tcpc_get_alert_status(void) @@ -763,17 +681,6 @@ uint16_t tcpc_get_alert_status(void) } } - if (!gpio_get_level(GPIO_SUB_USB_C1_INT_ODL)) { - if (!tcpc_read16(1, TCPC_REG_ALERT, ®val)) { - /* TCPCI spec Rev 1.0 says to ignore bits 14:12. */ - if (!(tcpc_config[1].flags & TCPC_FLAGS_TCPCI_REV2_0)) - regval &= ~((1 << 14) | (1 << 13) | (1 << 12)); - - if (regval) - status |= PD_STATUS_TCPC_ALERT_1; - } - } - return status; } diff --git a/board/corori/board.h b/board/corori/board.h index 1cbb6bf7e2..70f242fe6a 100644 --- a/board/corori/board.h +++ b/board/corori/board.h @@ -24,16 +24,10 @@ #define CONFIG_CHARGER_RAA489000 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 #define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_OCPC_DEF_RBATT_MOHMS 22 /* R_DS(on) 11.6mOhm + 10mOhm sns rstr */ -#define CONFIG_OCPC -#undef CONFIG_CHARGER_SINGLE_CHIP #undef CONFIG_CMD_CHARGER_DUMP #undef CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE #define CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE (100 * MSEC) -/* GPIO for C1 interrupts, for baseboard use */ -#define GPIO_USB_C1_INT_ODL GPIO_SUB_USB_C1_INT_ODL - /* Keyboard */ #define CONFIG_KEYBOARD_KEYPAD @@ -54,7 +48,6 @@ /* USB */ #define CONFIG_BC12_DETECT_PI3USB9201 -#define CONFIG_USBC_RETIMER_PS8802 /* Common USB-A defines */ #define USB_PORT_COUNT 2 @@ -68,7 +61,7 @@ /******************************************************************************/ /* USB PD */ -#define CONFIG_USB_PD_PORT_MAX_COUNT 2 +#define CONFIG_USB_PD_PORT_MAX_COUNT 1 #define CONFIG_USB_PD_TCPM_RAA489000 /* USB defines specific to external TCPCs */ @@ -137,12 +130,6 @@ #include "gpio_signal.h" #include "registers.h" -enum chg_id { - CHARGER_PRIMARY, - CHARGER_SECONDARY, - CHARGER_NUM, -}; - enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC0 */ ADC_TEMP_SENSOR_2, /* ADC1 */ diff --git a/board/corori/ec.tasklist b/board/corori/ec.tasklist index d4fb416bce..ee5333eb17 100644 --- a/board/corori/ec.tasklist +++ b/board/corori/ec.tasklist @@ -11,7 +11,6 @@ TASK_ALWAYS(HOOKS, hook_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ @@ -20,6 +19,4 @@ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(POWERBTN, power_button_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/corori/gpio.inc b/board/corori/gpio.inc index 3d81cd089d..5c31c0b96c 100644 --- a/board/corori/gpio.inc +++ b/board/corori/gpio.inc @@ -26,7 +26,6 @@ GPIO_INT(PG_PP1050_ST_OD, PIN(4, 2), GPIO_INT_BOTH, power_signal_interrupt) /* USB-C interrupts */ GPIO_INT(USB_C0_INT_ODL, PIN(6, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb_c0_interrupt) -GPIO_INT(SUB_USB_C1_INT_ODL, PIN(F, 5), GPIO_INT_FALLING | GPIO_PULL_UP, sub_usb_c1_interrupt) /* Button interrupts */ GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) |