diff options
| author | Rong Chang <rongchang@chromium.org> | 2015-09-07 15:46:05 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-09-14 00:48:39 -0700 |
| commit | 2eabf6fe8cffdd2c1e125344aa1692fab6795759 (patch) | |
| tree | 96d0657ed25bb4344f9a08e1035405de5699ba54 /common/usb_pd_tcpc.c | |
| parent | ea6c69c8392a3756c4f74ea23ab15db3ad263bbe (diff) | |
| download | chrome-ec-2eabf6fe8cffdd2c1e125344aa1692fab6795759.tar.gz | |
oak_pd: tcpm_power_status: Update power status on init
Oak board relies on TCPCI power status. When board init, PD should
update it's VBUS status and TCPM needs to get power status after enable
TCPC power status mask.
BRANCH=none
BUG=chrome-os-partner:44952
TEST=manual
build and load on oak, disconnect battery.
power on system with zinger, and check PD state.
Signed-off-by: Rong Chang <rongchang@chromium.org>
Change-Id: Ic0d4b50d38ac39ff31b3a257c4b3b5dde0ebda4b
Reviewed-on: https://chromium-review.googlesource.com/297871
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'common/usb_pd_tcpc.c')
| -rw-r--r-- | common/usb_pd_tcpc.c | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 5c42640d5b..88d4996844 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -744,25 +744,6 @@ static void alert(int port, int mask) tcpc_alert(port); } -void tcpc_init(int port) -{ - int i; - - /* Initialize physical layer */ - pd_hw_init(port, PD_ROLE_DEFAULT); - pd[port].cc_pull = PD_ROLE_DEFAULT == PD_ROLE_SOURCE ? TYPEC_CC_RP : - TYPEC_CC_RD; - - /* make sure PD monitoring is disabled initially */ - pd[port].rx_enabled = 0; - - /* make initial readings of CC voltages */ - for (i = 0; i < 2; i++) { - pd[port].cc_status[i] = cc_voltage_to_status(port, - pd_adc_read(port, i)); - } -} - int tcpc_run(int port, int evt) { int cc, i, res; @@ -1037,6 +1018,34 @@ int tcpc_get_message(int port, uint32_t *payload, int *head) return EC_SUCCESS; } +void tcpc_init(int port) +{ + int i; + + /* Initialize physical layer */ + pd_hw_init(port, PD_ROLE_DEFAULT); + pd[port].cc_pull = PD_ROLE_DEFAULT == PD_ROLE_SOURCE ? TYPEC_CC_RP : + TYPEC_CC_RD; + + /* make sure PD monitoring is disabled initially */ + pd[port].rx_enabled = 0; + + /* make initial readings of CC voltages */ + for (i = 0; i < 2; i++) { + pd[port].cc_status[i] = cc_voltage_to_status(port, + pd_adc_read(port, i)); + } + +#ifdef CONFIG_USB_PD_TCPM_VBUS +#if CONFIG_USB_PD_PORT_COUNT >= 2 + tcpc_set_power_status(port, !gpio_get_level(port ? + GPIO_USB_C1_VBUS_WAKE_L : + GPIO_USB_C0_VBUS_WAKE_L)); +#else + tcpc_set_power_status(port, !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); +#endif /* CONFIG_USB_PD_PORT_COUNT >= 2 */ +#endif /* CONFIG_USB_PD_TCPM_VBUS */ +} #ifdef CONFIG_USB_PD_TCPM_VBUS void pd_vbus_evt_p0(enum gpio_signal signal) |