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 /board/agah/gpio.inc | |
| 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 'board/agah/gpio.inc')
| -rw-r--r-- | board/agah/gpio.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/agah/gpio.inc b/board/agah/gpio.inc index a1573f6290..41a8f2a4d8 100644 --- a/board/agah/gpio.inc +++ b/board/agah/gpio.inc @@ -26,6 +26,7 @@ GPIO_INT(PG_PP3300_S5_OD, PIN(B, 4), GPIO_INT_BOTH | GPIO_PULL_UP GPIO_INT(USB_C2_BC12_INT_ODL, PIN(8, 3), GPIO_INT_FALLING, bc12_interrupt) GPIO_INT(USB_C2_TCPC_INT_ODL, PIN(A, 7), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C2_PPC_INT_ODL, PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(BJ_ADP_PRESENT_ODL, PIN(5, 6), GPIO_INT_BOTH | GPIO_PULL_UP, bj_present_interrupt) /* USED GPIOs: */ GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT) @@ -68,8 +69,7 @@ GPIO(PG_PP3300_S5_EC_SEQ_OD, PIN(B, 5), GPIO_OUT_LOW) GPIO(USB_C2_FRS_EN, PIN(D, 4), GPIO_OUT_LOW) /* Barreljack */ -GPIO(EN_PPVAR_BJ_ADP, PIN(A, 2), GPIO_OUT_LOW) -GPIO(BJ_ADP_PRESENT_L, PIN(5, 6), GPIO_INPUT) +GPIO(EN_PPVAR_BJ_ADP_L, PIN(A, 2), GPIO_OUT_LOW) /* * The NPCX keyboard driver does not use named GPIOs to access @@ -128,4 +128,4 @@ UNUSED(PIN(7, 3)) /* GPIO73 */ UNUSED(PIN(4, 1)) /* GPIO41 */ UNUSED(PIN(5, 0)) /* GPIO50 */ UNUSED(PIN(6, 0)) /* GPIO60 */ -UNUSED(PIN(C, 2)) /* GPIOC2 */
\ No newline at end of file +UNUSED(PIN(C, 2)) /* GPIOC2 */ |