diff options
author | Aseda Aboagye <aaboagye@google.com> | 2021-02-16 17:21:59 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-02-17 17:21:42 +0000 |
commit | a34dcdf2dfccaee1f90da6b78d5d2529d0d2e93a (patch) | |
tree | 590a892edc6db6a3589d8f19abc8209e1bb739f3 /board/metaknight | |
parent | 142acc797b1dfc92f44c443103b361ad103a976f (diff) | |
download | chrome-ec-a34dcdf2dfccaee1f90da6b78d5d2529d0d2e93a.tar.gz |
metaknight: Remove remnants of 2nd charger IC
This commit cleans up the remnants of a 2nd charger IC as metaknight
does not plan to support one.
BUG=b:169813211
BRANCH=dedede
TEST=`make -j BOARD=metaknight`
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I9368cd831cf134f39741a46f2a9ee511bdeeb7cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2698375
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board/metaknight')
-rw-r--r-- | board/metaknight/board.c | 68 | ||||
-rw-r--r-- | board/metaknight/board.h | 3 | ||||
-rw-r--r-- | board/metaknight/gpio.inc | 20 |
3 files changed, 13 insertions, 78 deletions
diff --git a/board/metaknight/board.c b/board/metaknight/board.c index 4bd8404392..cd800269c5 100644 --- a/board/metaknight/board.c +++ b/board/metaknight/board.c @@ -102,41 +102,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_C1_INT_EN_RAILS_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); - -} - static void sub_hdmi_hpd_interrupt(enum gpio_signal s) { int hdmi_hpd_odl = gpio_get_level(GPIO_EC_I2C_SUB_C1_SDA_HDMI_HPD_ODL); @@ -346,30 +311,17 @@ __override void board_power_5v_enable(int enable) if (get_cbi_fw_config_db() == DB_1A_HDMI || get_cbi_fw_config_db() == DB_LTE_HDMI) { gpio_set_level(GPIO_SUB_C1_INT_EN_RAILS_ODL, !enable); - } else { - if (isl923x_set_comparator_inversion(1, !!enable)) - CPRINTS("Failed to %sable sub rails!", enable ? - "en" : "dis"); } - } __override uint8_t board_get_usb_pd_port_count(void) { - if (get_cbi_fw_config_db() == DB_1A_HDMI || - get_cbi_fw_config_db() == DB_LTE_HDMI) - return CONFIG_USB_PD_PORT_MAX_COUNT - 1; - else - return CONFIG_USB_PD_PORT_MAX_COUNT; + return CONFIG_USB_PD_PORT_MAX_COUNT; } __override uint8_t board_get_charger_chip_count(void) { - if (get_cbi_fw_config_db() == DB_1A_HDMI || - get_cbi_fw_config_db() == DB_LTE_HDMI) - return CHARGER_NUM - 1; - else - return CHARGER_NUM; + return CHARGER_NUM; } int board_is_sourcing_vbus(int port) @@ -673,10 +625,6 @@ void board_init(void) /* Set SDA as an input */ gpio_set_flags(GPIO_EC_I2C_SUB_C1_SDA_HDMI_HPD_ODL, GPIO_INPUT); - - /* Enable C1 interrupts */ - gpio_enable_interrupt(GPIO_SUB_C1_INT_EN_RAILS_ODL); - check_c1_line(); } /* Enable gpio interrupt for base accelgyro sensor */ gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); @@ -710,18 +658,6 @@ void board_init(void) } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); -__override void ocpc_get_pid_constants(int *kp, int *kp_div, - int *ki, int *ki_div, - int *kd, int *kd_div) -{ - *kp = 1; - *kp_div = 20; - *ki = 1; - *ki_div = 250; - *kd = 0; - *kd_div = 1; -} - int pd_snk_is_vbus_provided(int port) { return pd_check_vbus_level(port, VBUS_PRESENT); diff --git a/board/metaknight/board.h b/board/metaknight/board.h index abbdf906b6..65f32064cb 100644 --- a/board/metaknight/board.h +++ b/board/metaknight/board.h @@ -65,7 +65,7 @@ #define GPIO_USB2_ILIM_SEL GPIO_USB_A1_CHARGE_EN_L /* 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 */ @@ -155,7 +155,6 @@ enum chg_id { CHARGER_PRIMARY, - CHARGER_SECONDARY, CHARGER_NUM, }; diff --git a/board/metaknight/gpio.inc b/board/metaknight/gpio.inc index 8b8f84048d..0345a15858 100644 --- a/board/metaknight/gpio.inc +++ b/board/metaknight/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_C1_INT_EN_RAILS_ODL, PIN(F, 5), GPIO_INT_FALLING | GPIO_PULL_UP, sub_usb_c1_interrupt) /* C1 interrupt OR 5V power en */ GPIO_INT(EC_I2C_SUB_C1_SDA_HDMI_HPD_ODL, PIN(9, 1), GPIO_INT_BOTH, sub_hdmi_hpd_interrupt) /* C1 I2C SDA OR HDMI_HPD */ /* Button interrupts */ @@ -56,15 +55,16 @@ GPIO(EC_SUB_IO_2, PIN(3, 4), GPIO_OUT_LOW) /* Misc Enables */ GPIO(EN_VCCIO_EXT, PIN(6, 1), GPIO_OUT_LOW) /* TODO(b:149775160) - Modify if needed if we ever use this signal. */ -GPIO(EN_VCCST, PIN(A, 7), GPIO_INPUT) -GPIO(EN_PP3300_PEN, PIN(6, 3), GPIO_OUT_LOW) -GPIO(EN_PP3300_A, PIN(0, 3), GPIO_OUT_LOW) -GPIO(EN_PP5000_U, PIN(A, 4), GPIO_OUT_LOW) -GPIO(EN_SLP_Z, PIN(8, 3), GPIO_OUT_LOW) -GPIO(EN_KB_BL, PIN(6, 0), GPIO_OUT_LOW) -GPIO(EN_BL_OD, PIN(D, 3), GPIO_ODR_LOW) -GPIO(IMVP9_PE, PIN(E, 0), GPIO_OUT_LOW) -GPIO(ECH1_PACKET_MODE, PIN(7, 5), GPIO_OUT_LOW) +GPIO(EN_VCCST, PIN(A, 7), GPIO_INPUT) +GPIO(EN_PP3300_PEN, PIN(6, 3), GPIO_OUT_LOW) +GPIO(EN_PP3300_A, PIN(0, 3), GPIO_OUT_LOW) +GPIO(EN_PP5000_U, PIN(A, 4), GPIO_OUT_LOW) +GPIO(EN_SLP_Z, PIN(8, 3), GPIO_OUT_LOW) +GPIO(EN_KB_BL, PIN(6, 0), GPIO_OUT_LOW) +GPIO(EN_BL_OD, PIN(D, 3), GPIO_ODR_LOW) +GPIO(IMVP9_PE, PIN(E, 0), GPIO_OUT_LOW) +GPIO(ECH1_PACKET_MODE, PIN(7, 5), GPIO_OUT_LOW) +GPIO(SUB_C1_INT_EN_RAILS_ODL, PIN(F, 5), GPIO_ODR_LOW)/* 5V power en */ /* LED */ GPIO(LED_W_ODL, PIN(C, 3), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) /* LED White */ |