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/banshee/board.c | |
| 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/banshee/board.c')
| -rw-r--r-- | board/banshee/board.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/board/banshee/board.c b/board/banshee/board.c index 4f2b06b448..8f1d8bb811 100644 --- a/board/banshee/board.c +++ b/board/banshee/board.c @@ -85,12 +85,20 @@ void board_init(void) if (board_id == 0) { /* keyboard_col2_inverted on board id 0 */ gpio_set_flags(GPIO_EC_KSO_04_INV, GPIO_ODR_HIGH); - gpio_set_alternate_function(GPIO_PORT_1, BIT(5), + gpio_set_flags(GPIO_EC_KSO_05_INV, GPIO_ODR_HIGH); + gpio_set_alternate_function(GPIO_PORT_1, (BIT(4) | BIT(5)), + GPIO_ALT_FUNC_DEFAULT); + } else if (board_id == 1) { + /* keyboard_col4_inverted on board id 1 */ + gpio_set_flags(GPIO_EC_KSO_02_INV, GPIO_ODR_HIGH); + gpio_set_flags(GPIO_EC_KSO_05_INV, GPIO_ODR_HIGH); + gpio_set_alternate_function(GPIO_PORT_1, (BIT(4) | BIT(7)), GPIO_ALT_FUNC_DEFAULT); } else { - /* keyboard_col4_inverted on board id 1 and later */ + /* keyboard_col5_inverted on board id 2 and later */ gpio_set_flags(GPIO_EC_KSO_02_INV, GPIO_ODR_HIGH); - gpio_set_alternate_function(GPIO_PORT_1, BIT(7), + gpio_set_flags(GPIO_EC_KSO_04_INV, GPIO_ODR_HIGH); + gpio_set_alternate_function(GPIO_PORT_1, (BIT(5) | BIT(7)), GPIO_ALT_FUNC_DEFAULT); } |