diff options
| author | Koro Chen <koro.chen@mediatek.com> | 2016-06-15 10:00:07 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-06-17 07:36:26 -0700 |
| commit | 0cf04948a8b546c815a9e4906b5fc6b954ad5889 (patch) | |
| tree | 9b0c9742624137969215c732db05c3aa9b6d094c | |
| parent | 8d343c1548600705adae922640042a0dac8b6399 (diff) | |
| download | chrome-ec-0cf04948a8b546c815a9e4906b5fc6b954ad5889.tar.gz | |
Revert "elm: get VBUS statue from GPIO"
This reverts commit abe2a55191dbcdf8c92bfea64601b607471d75be due to
it triggers Issue 54108.
Change-Id: I19c89511e31b056285680e3afff95f44b4d932a6
Signed-off-by: Koro Chen <koro.chen@mediatek.com>
Reviewed-on: https://chromium-review.googlesource.com/352832
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | board/elm/board.c | 2 | ||||
| -rw-r--r-- | board/elm/board.h | 2 | ||||
| -rw-r--r-- | board/elm/usb_pd_policy.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/board/elm/board.c b/board/elm/board.c index ed985f6158..fc8cf73a3b 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -279,7 +279,7 @@ static void board_init(void) board_power_on_pd_mcu(); /* Update VBUS supplier */ - usb_charger_vbus_change(0, pd_snk_is_vbus_provided(0)); + usb_charger_vbus_change(0, !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); /* Remap SPI2 to DMA channels 6 and 7 */ REG32(STM32_DMA1_BASE + 0xa8) |= (1 << 20) | (1 << 21) | diff --git a/board/elm/board.h b/board/elm/board.h index 46f4216af2..b30c05b04a 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -96,7 +96,7 @@ #define CONFIG_USB_PD_TCPM_ANX7688 #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC -#define CONFIG_USB_PD_VBUS_DETECT_GPIO +#define CONFIG_USB_PD_VBUS_DETECT_TCPC #undef CONFIG_TCPC_I2C_BASE_ADDR #define CONFIG_TCPC_I2C_BASE_ADDR 0x58 #define CONFIG_USB_PD_ANX7688 diff --git a/board/elm/usb_pd_policy.c b/board/elm/usb_pd_policy.c index 2d27f539b9..05cfe97e0b 100644 --- a/board/elm/usb_pd_policy.c +++ b/board/elm/usb_pd_policy.c @@ -96,11 +96,6 @@ void typec_set_input_current_limit(int port, uint32_t max_ma, charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge); } -int pd_snk_is_vbus_provided(int port) -{ - return !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L); -} - int pd_board_checks(void) { return EC_SUCCESS; |