diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-06-01 16:23:30 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-06-02 14:06:53 -0700 |
| commit | 54261224660e9deb980c8d39b74f144f01edf68a (patch) | |
| tree | a794df2dc6bc10048ebc2f12be2b2efba5c40ef7 /common/usb_pd_tcpc.c | |
| parent | 4f600b32bbcdd1f870f8389b8666101d3a8513ed (diff) | |
| download | chrome-ec-54261224660e9deb980c8d39b74f144f01edf68a.tar.gz | |
cleanup: pd: Define VBUS detection source
Previously CONFIG_USB_PD_TCPM_VBUS had two uses which were independent:
- When operating as a TCPC, it indicated that the VBUS level should be
tracked (through GPIO inputs) and sent to the external TCPM when
appropriate.
- When operating as a TCPM, it indicated that the VBUS level should be
obtained by querying the TCPC.
These two independent uses have been split into
CONFIG_USB_PD_TCPC_TRACK_VBUS and CONFIG_USB_PD_VBUS_DETECT_TCPC, which
sould be more clear.
In addition, CONFIG_USB_PD_VBUS_DETECT_* CONFIGs have been added for
other means of VBUS detection.
BUG=chromium:616580
BRANCH=None
TEST=Verify kevin continues to boot + charge.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I936821481d6577e17e3e9c61ff97c037574d6923
Reviewed-on: https://chromium-review.googlesource.com/348950
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'common/usb_pd_tcpc.c')
| -rw-r--r-- | common/usb_pd_tcpc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 8e6b9dda5e..644f27dcd1 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -978,7 +978,7 @@ int tcpc_set_polarity(int port, int polarity) return EC_SUCCESS; } -#ifdef CONFIG_USB_PD_TCPM_VBUS +#ifdef CONFIG_USB_PD_TCPC_TRACK_VBUS static int tcpc_set_power_status(int port, int vbus_present) { /* Update VBUS present bit */ @@ -993,7 +993,7 @@ static int tcpc_set_power_status(int port, int vbus_present) return EC_SUCCESS; } -#endif /* CONFIG_USB_PD_TCPM_VBUS */ +#endif /* CONFIG_USB_PD_TCPC_TRACK_VBUS */ int tcpc_set_power_status_mask(int port, uint8_t mask) { @@ -1102,7 +1102,7 @@ void tcpc_init(int port) pd_adc_read(port, i)); } -#ifdef CONFIG_USB_PD_TCPM_VBUS +#ifdef CONFIG_USB_PD_TCPC_TRACK_VBUS #if CONFIG_USB_PD_PORT_COUNT >= 2 tcpc_set_power_status(port, !gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE_L : @@ -1110,7 +1110,7 @@ void tcpc_init(int port) #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 */ +#endif /* CONFIG_USB_PD_TCPC_TRACK_VBUS */ /* set default alert and power mask register values */ pd[port].alert_mask = TCPC_REG_ALERT_MASK_ALL; @@ -1120,7 +1120,7 @@ void tcpc_init(int port) alert(port, TCPC_REG_ALERT_POWER_STATUS); } -#ifdef CONFIG_USB_PD_TCPM_VBUS +#ifdef CONFIG_USB_PD_TCPC_TRACK_VBUS void pd_vbus_evt_p0(enum gpio_signal signal) { tcpc_set_power_status(TASK_ID_TO_PD_PORT(TASK_ID_PD_C0), @@ -1136,7 +1136,7 @@ void pd_vbus_evt_p1(enum gpio_signal signal) task_wake(TASK_ID_PD_C1); } #endif /* PD_PORT_COUNT >= 2 */ -#endif /* CONFIG_USB_PD_TCPM_VBUS */ +#endif /* CONFIG_USB_PD_TCPC_TRACK_VBUS */ #ifndef CONFIG_USB_POWER_DELIVERY static void tcpc_i2c_write(int port, int reg, int len, uint8_t *payload) |