diff options
| author | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
|---|---|---|
| committer | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
| commit | e5fb0b9ba488614b5684e640530f00821ab7b943 (patch) | |
| tree | 9a15b4a98d7987870a1805a33883d0cf9123fc05 /board/agah/board.h | |
| parent | ad46fafb27c419bd416bfecc76df6c6426a99b32 (diff) | |
| parent | a46d3f3feaac0d69012f61b66f652bff991d05a7 (diff) | |
| download | chrome-ec-e5fb0b9ba488614b5684e640530f00821ab7b943.tar.gz | |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-bloonchipper-release
Relevant changes:
git log --oneline ad46fafb27..a46d3f3fea -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
38ef6b7306 tree: Files should end with single newline
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 b:172020503 b:234181908
TEST=`make -j buildall`
Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I18b58de542c8b439d0f9327a7d4f0ec897da080f
Diffstat (limited to 'board/agah/board.h')
| -rw-r--r-- | board/agah/board.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/board/agah/board.h b/board/agah/board.h index 9b9998d6a8..7655f9a4fe 100644 --- a/board/agah/board.h +++ b/board/agah/board.h @@ -51,6 +51,7 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_TCPM_RT1715 #undef CONFIG_USB_PD_TCPM_NCT38XX +#define CONFIG_USBC_RETIMER_PS8818 /* I2C speed console command */ #define CONFIG_CMD_I2C_SPEED @@ -138,10 +139,15 @@ /* Charger defines */ #define CONFIG_CHARGER_ISL9241 -#define CONFIG_CHARGE_RAMP_SW #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 +/* Barrel jack adapter settings */ +#undef CONFIG_DEDICATED_CHARGE_PORT_COUNT +#define CONFIG_DEDICATED_CHARGE_PORT_COUNT 1 +/* This is the next available port # after USB-C ports. */ +#define DEDICATED_CHARGE_PORT 2 + /* * Older boards have a different ADC assignment. */ @@ -197,6 +203,12 @@ enum mft_channel { MFT_CH_COUNT }; +enum charge_port { + CHARGE_PORT_TYPEC0, + CHARGE_PORT_TYPEC1, + CHARGE_PORT_BARRELJACK, +}; + /** * Interrupt handler for PG_PP3300_S5_OD changes. * @@ -204,6 +216,9 @@ enum mft_channel { */ void board_power_interrupt(enum gpio_signal signal); +/* IRQ for BJ plug/unplug. */ +void bj_present_interrupt(enum gpio_signal signal); + #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ |