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 /include/power.h | |
| 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 'include/power.h')
| -rw-r--r-- | include/power.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/power.h b/include/power.h index 547a4d93ab..6200392b95 100644 --- a/include/power.h +++ b/include/power.h @@ -8,6 +8,7 @@ #ifndef __CROS_EC_POWER_H #define __CROS_EC_POWER_H +#include "chipset.h" #include "common.h" #include "compiler.h" #include "gpio_signal.h" @@ -173,7 +174,7 @@ void power_set_state(enum power_state new_state); * * @return Current chipset power state */ -#ifdef HAS_TASK_CHIPSET +#ifdef CONFIG_AP_POWER_CONTROL enum power_state power_get_state(void); #else static inline enum power_state power_get_state(void) { @@ -204,11 +205,11 @@ enum power_state power_handle_state(enum power_state state); /** * Interrupt handler for power signal GPIOs. */ -#ifdef HAS_TASK_CHIPSET +#ifdef CONFIG_AP_POWER_CONTROL void power_signal_interrupt(enum gpio_signal signal); #else static inline void power_signal_interrupt(enum gpio_signal signal) { } -#endif /* !HAS_TASK_CHIPSET */ +#endif /* !CONFIG_AP_POWER_CONTROL */ /** * Interrupt handler for rsmrst signal GPIO. This interrupt handler should be |