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/taniks/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/taniks/board.c')
| -rw-r--r-- | board/taniks/board.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/board/taniks/board.c b/board/taniks/board.c index 2c2cf4cb44..894e055b9a 100644 --- a/board/taniks/board.c +++ b/board/taniks/board.c @@ -29,6 +29,7 @@ #include "tablet_mode.h" #include "throttle_ap.h" #include "usbc_config.h" +#include "rgb_keyboard.h" #include "gpio_list.h" /* Must come after other header files. */ @@ -46,6 +47,12 @@ BUILD_ASSERT(ARRAY_SIZE(usb_port_enable) == USB_PORT_COUNT); /******************************************************************************/ +const struct rgbkbd_init rgbkbd_init_taniks = { + .gcc = RGBKBD_MAX_GCC_LEVEL / 2, + .scale = { .r = 190, .g = 255, .b = 255 }, + .color = { .r = 255, .g = 255, .b = 255 }, +}; + __override void board_cbi_init(void) { config_usb_db_type(); @@ -53,16 +60,9 @@ __override void board_cbi_init(void) void board_init(void) { - - if (ec_cfg_has_tabletmode()) { - - } else { - /* only clamshell todo */ - gpio_set_flags(GPIO_EC_VOLUP_BTN_ODL, GPIO_INPUT | GPIO_PULL_DOWN); - gpio_set_flags(GPIO_EC_VOLDN_BTN_ODL, GPIO_INPUT | GPIO_PULL_DOWN); - button_disable_gpio(BUTTON_VOLUME_UP); - button_disable_gpio(BUTTON_VOLUME_DOWN); - } +#ifdef SECTION_IS_RW + rgbkbd_register_init_setting(&rgbkbd_init_taniks); +#endif } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); |