summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Lin <kylelinck@google.com>2022-12-13 13:48:58 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-12-13 17:19:46 +0000
commitf439c4f2098d14e66f29d2ac65dadc095d984e5d (patch)
tree3dcf6b636c0713b1c0133e4f86f3823cd829706e
parent1ee938e36b7396252a963e70d07c9129535713b1 (diff)
downloadchrome-ec-f439c4f2098d14e66f29d2ac65dadc095d984e5d.tar.gz
driver/tcpm: PD event for VBUS change shouldn't depend on BC 1.2
PD event for VBUS change should always be set whether BC 1.2 feature is enabled or not. BUG=b:256539662 TEST=Disable BC 1.2 on Pujjo. USB PD charging works OK. BRANCH=None Change-Id: I4e0965f8019fe29a929ce52fc9aab493b7b8b6dd Signed-off-by: Kyle Lin <kylelinck@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4099988 Commit-Queue: Diana Z <dzigterman@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
-rw-r--r--driver/tcpm/tcpci.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c
index 243ca94bd5..7924f653b7 100644
--- a/driver/tcpm/tcpci.c
+++ b/driver/tcpm/tcpci.c
@@ -1167,14 +1167,16 @@ static void tcpci_check_vbus_changed(int port, int alert, uint32_t *pd_event)
tcpc_vbus[port] = BIT(VBUS_SAFE0V);
}
- if ((get_usb_pd_vbus_detect() == USB_PD_VBUS_DETECT_TCPC) &&
- IS_ENABLED(CONFIG_USB_CHARGER)) {
+ if (get_usb_pd_vbus_detect() == USB_PD_VBUS_DETECT_TCPC) {
/* Update charge manager with new VBUS state */
- usb_charger_vbus_change(port, !!(tcpc_vbus[port] &
- BIT(VBUS_PRESENT)));
+ if (IS_ENABLED(CONFIG_USB_CHARGER))
+ usb_charger_vbus_change(port,
+ !!(tcpc_vbus[port] &
+ BIT(VBUS_PRESENT)));
- if (pd_event)
+ if (pd_event) {
*pd_event |= TASK_EVENT_WAKE;
+ }
}
}
}