diff options
| author | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:41:11 +0000 |
|---|---|---|
| committer | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:41:11 +0000 |
| commit | 6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d (patch) | |
| tree | 9a15b4a98d7987870a1805a33883d0cf9123fc05 /driver/bc12/pi3usb9201.c | |
| parent | 63a8a1366e390b757c37e167927102be0fc4fb63 (diff) | |
| parent | a46d3f3feaac0d69012f61b66f652bff991d05a7 (diff) | |
| download | chrome-ec-6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d.tar.gz | |
Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-release
Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release
Relevant changes:
git log --oneline 63a8a1366e..a46d3f3fea -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
60032a8828 docs/fingerprint: Clean up formatting in fingerprint-factory-quick-guide.md
f49eb6f894 docs/fingerprint: Run mdformat
64aa5fc7bb docs/fingerprint: Add links to info on fuzz testing
8bd99cc434 fpsensor: Use correct return type
2b2d7a991d fpsensor: Use correct return type
BRANCH=None
BUG=b:234772776 b:234181908
TEST=`make -j buildall`
Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I1714a77d292aad81bdc71982c88b2b067cfdada7
Diffstat (limited to 'driver/bc12/pi3usb9201.c')
| -rw-r--r-- | driver/bc12/pi3usb9201.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/bc12/pi3usb9201.c b/driver/bc12/pi3usb9201.c index 6d47ed5d04..9e60c9b4fd 100644 --- a/driver/bc12/pi3usb9201.c +++ b/driver/bc12/pi3usb9201.c @@ -203,7 +203,7 @@ static void bc12_power_down(int port) if (pi3usb9201_bc12_chips[port].flags & PI3USB9201_ALWAYS_POWERED) return; -#if defined(CONFIG_POWER_PP5000_CONTROL) && defined(HAS_TASK_CHIPSET) +#if defined(CONFIG_POWER_PP5000_CONTROL) && defined(CONFIG_AP_POWER_CONTROL) /* Indicate PP5000_A rail is not required by USB_CHG task. */ power_5v_enable(task_get_current(), 0); #endif @@ -212,7 +212,7 @@ static void bc12_power_down(int port) static void bc12_power_up(int port) { if (IS_ENABLED(CONFIG_POWER_PP5000_CONTROL) && - IS_ENABLED(HAS_TASK_CHIPSET) && + IS_ENABLED(CONFIG_AP_POWER_CONTROL) && !(pi3usb9201_bc12_chips[port].flags & PI3USB9201_ALWAYS_POWERED)) { /* Turn on the 5V rail to allow the chip to be powered. */ power_5v_enable(task_get_current(), 1); |