diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /driver/led/is31fl3733b.c | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-2bcf863b492fe7ed8105c853814dba6ed32ba719.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-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 e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "stm32f_rtc": PASSED
Test "panic_data_bloonchipper_v2.0.4277": PASSED
Test "panic_data_bloonchipper_v2.0.5938": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3
Diffstat (limited to 'driver/led/is31fl3733b.c')
-rw-r--r-- | driver/led/is31fl3733b.c | 116 |
1 files changed, 56 insertions, 60 deletions
diff --git a/driver/led/is31fl3733b.c b/driver/led/is31fl3733b.c index 5b1df890f1..33004d1cec 100644 --- a/driver/led/is31fl3733b.c +++ b/driver/led/is31fl3733b.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. All rights reserved. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -14,63 +14,62 @@ #define CPRINTF(fmt, args...) cprintf(CC_RGBKBD, "RGBKBD: " fmt, ##args) #define CPRINTS(fmt, args...) cprints(CC_RGBKBD, "RGBKBD: " fmt, ##args) - /* This depends on ADDR1 and ADDR2. (GND, GND) = 0x50. */ -#define IS31FL3733B_ADDR_FLAGS 0x50 +#define IS31FL3733B_ADDR_FLAGS 0x50 -#define IS31FL3733B_ROW_SIZE 16 -#define IS31FL3733B_COL_SIZE 4 -#define IS31FL3733B_GRID_SIZE (IS31FL3733B_COL_SIZE * IS31FL3733B_ROW_SIZE) -#define IS31FL3733B_BUF_SIZE (SIZE_OF_RGB * IS31FL3733B_GRID_SIZE) +#define IS31FL3733B_ROW_SIZE 16 +#define IS31FL3733B_COL_SIZE 4 +#define IS31FL3733B_GRID_SIZE (IS31FL3733B_COL_SIZE * IS31FL3733B_ROW_SIZE) +#define IS31FL3733B_BUF_SIZE (SIZE_OF_RGB * IS31FL3733B_GRID_SIZE) /* IS31FL3733B registers */ -#define IS31FL3733B_REG_COMMAND 0xFD -#define IS31FL3733B_REG_COMMAND_WRITE_LOCK 0xFE -#define IS31FL3733B_REG_INT_MASK 0xF0 -#define IS31FL3733B_REG_INT_STATUS 0xF1 +#define IS31FL3733B_REG_COMMAND 0xFD +#define IS31FL3733B_REG_COMMAND_WRITE_LOCK 0xFE +#define IS31FL3733B_REG_INT_MASK 0xF0 +#define IS31FL3733B_REG_INT_STATUS 0xF1 -#define IS31FL3733B_PAGE_CTRL 0x00 -#define IS31FL3733B_PAGE_PWM 0x01 -#define IS31FL3733B_PAGE_AUTO 0x02 -#define IS31FL3733B_PAGE_FUNC 0x03 +#define IS31FL3733B_PAGE_CTRL 0x00 +#define IS31FL3733B_PAGE_PWM 0x01 +#define IS31FL3733B_PAGE_AUTO 0x02 +#define IS31FL3733B_PAGE_FUNC 0x03 /* FEh Command Register Write Lock */ -#define IS31FL3733B_WRITE_DISABLE 0x00 -#define IS31FL3733B_WRITE_ENABLE 0xC5 - -#define IS31FL3733B_INT_MASK_IAC BIT(3) -#define IS31FL3733B_INT_MASK_IAB BIT(2) -#define IS31FL3733B_INT_MASK_IS BIT(1) -#define IS31FL3733B_INT_MASK_IO BIT(0) -#define IS31FL3733B_INT_STATUS_ABM3 BIT(4) -#define IS31FL3733B_INT_STATUS_ABM2 BIT(3) -#define IS31FL3733B_INT_STATUS_ABM1 BIT(2) -#define IS31FL3733B_INT_STATUS_SB BIT(1) -#define IS31FL3733B_INT_STATUS_OB BIT(0) - -#define IS31FL3733B_FUNC_CFG 0x00 -#define IS31FL3733B_FUNC_GCC 0x01 -#define IS31FL3733B_FUNC_ABM1_1 0x02 -#define IS31FL3733B_FUNC_ABM1_2 0x03 -#define IS31FL3733B_FUNC_ABM1_3 0x04 -#define IS31FL3733B_FUNC_ABM1_4 0x05 -#define IS31FL3733B_FUNC_ABM2_1 0x06 -#define IS31FL3733B_FUNC_ABM2_2 0x07 -#define IS31FL3733B_FUNC_ABM2_3 0x08 -#define IS31FL3733B_FUNC_ABM2_4 0x09 -#define IS31FL3733B_FUNC_ABM3_1 0x0a -#define IS31FL3733B_FUNC_ABM3_2 0x0b -#define IS31FL3733B_FUNC_ABM3_3 0x0c -#define IS31FL3733B_FUNC_ABM3_4 0x0d -#define IS31FL3733B_FUNC_TUR 0x0e -#define IS31FL3733B_FUNC_SW_PU 0x0f -#define IS31FL3733B_FUNC_CS_PD 0x10 -#define IS31FL3733B_FUNC_RST 0x11 +#define IS31FL3733B_WRITE_DISABLE 0x00 +#define IS31FL3733B_WRITE_ENABLE 0xC5 + +#define IS31FL3733B_INT_MASK_IAC BIT(3) +#define IS31FL3733B_INT_MASK_IAB BIT(2) +#define IS31FL3733B_INT_MASK_IS BIT(1) +#define IS31FL3733B_INT_MASK_IO BIT(0) +#define IS31FL3733B_INT_STATUS_ABM3 BIT(4) +#define IS31FL3733B_INT_STATUS_ABM2 BIT(3) +#define IS31FL3733B_INT_STATUS_ABM1 BIT(2) +#define IS31FL3733B_INT_STATUS_SB BIT(1) +#define IS31FL3733B_INT_STATUS_OB BIT(0) + +#define IS31FL3733B_FUNC_CFG 0x00 +#define IS31FL3733B_FUNC_GCC 0x01 +#define IS31FL3733B_FUNC_ABM1_1 0x02 +#define IS31FL3733B_FUNC_ABM1_2 0x03 +#define IS31FL3733B_FUNC_ABM1_3 0x04 +#define IS31FL3733B_FUNC_ABM1_4 0x05 +#define IS31FL3733B_FUNC_ABM2_1 0x06 +#define IS31FL3733B_FUNC_ABM2_2 0x07 +#define IS31FL3733B_FUNC_ABM2_3 0x08 +#define IS31FL3733B_FUNC_ABM2_4 0x09 +#define IS31FL3733B_FUNC_ABM3_1 0x0a +#define IS31FL3733B_FUNC_ABM3_2 0x0b +#define IS31FL3733B_FUNC_ABM3_3 0x0c +#define IS31FL3733B_FUNC_ABM3_4 0x0d +#define IS31FL3733B_FUNC_TUR 0x0e +#define IS31FL3733B_FUNC_SW_PU 0x0f +#define IS31FL3733B_FUNC_CS_PD 0x10 +#define IS31FL3733B_FUNC_RST 0x11 static int is31fl3733b_read(struct rgbkbd *ctx, uint8_t addr, uint8_t *value) { - return i2c_xfer(ctx->cfg->i2c, IS31FL3733B_ADDR_FLAGS, - &addr, sizeof(addr), value, sizeof(*value)); + return i2c_xfer(ctx->cfg->i2c, IS31FL3733B_ADDR_FLAGS, &addr, + sizeof(addr), value, sizeof(*value)); } static int is31fl3733b_write(struct rgbkbd *ctx, uint8_t addr, uint8_t value) @@ -80,8 +79,8 @@ static int is31fl3733b_write(struct rgbkbd *ctx, uint8_t addr, uint8_t value) [1] = value, }; - return i2c_xfer(ctx->cfg->i2c, IS31FL3733B_ADDR_FLAGS, - buf, sizeof(buf), NULL, 0); + return i2c_xfer(ctx->cfg->i2c, IS31FL3733B_ADDR_FLAGS, buf, sizeof(buf), + NULL, 0); } static int is31fl3733b_set_page(struct rgbkbd *ctx, uint8_t page) @@ -90,7 +89,7 @@ static int is31fl3733b_set_page(struct rgbkbd *ctx, uint8_t page) /* unlock page select once */ rv = is31fl3733b_write(ctx, IS31FL3733B_REG_COMMAND_WRITE_LOCK, - IS31FL3733B_WRITE_ENABLE); + IS31FL3733B_WRITE_ENABLE); if (rv) { return rv; } @@ -99,7 +98,7 @@ static int is31fl3733b_set_page(struct rgbkbd *ctx, uint8_t page) } static int is31fl3733b_get_config(struct rgbkbd *ctx, uint8_t addr, - uint8_t *value) + uint8_t *value) { int rv; @@ -112,7 +111,7 @@ static int is31fl3733b_get_config(struct rgbkbd *ctx, uint8_t addr, } static int is31fl3733b_set_config(struct rgbkbd *ctx, uint8_t addr, - uint8_t value) + uint8_t value) { int rv; @@ -150,7 +149,7 @@ static int is31fl3733b_enable(struct rgbkbd *ctx, bool enable) } static int is31fl3733b_set_color(struct rgbkbd *ctx, uint8_t offset, - struct rgb_s *color, uint8_t len) + struct rgb_s *color, uint8_t len) { int led_addr, led_addr_row, led_addr_col; int i, rv; @@ -165,7 +164,7 @@ static int is31fl3733b_set_color(struct rgbkbd *ctx, uint8_t offset, led_addr_col = (offset + i) / ctx->cfg->row_len; led_addr = led_addr_row * 0x30 + led_addr_col; - rv = is31fl3733b_write(ctx, led_addr + 0x00, color[i].r); + rv = is31fl3733b_write(ctx, led_addr + 0x00, color[i].r); rv |= is31fl3733b_write(ctx, led_addr + 0x10, color[i].g); rv |= is31fl3733b_write(ctx, led_addr + 0x20, color[i].b); @@ -209,16 +208,13 @@ static int is31fl3733b_init(struct rgbkbd *ctx) } if (IS_ENABLED(CONFIG_RGB_KEYBOARD_DEBUG)) { - uint8_t val; int ret; - ret = is31fl3733b_get_config(ctx, - IS31FL3733B_FUNC_SW_PU, &val); + ret = is31fl3733b_get_config(ctx, IS31FL3733B_FUNC_SW_PU, &val); CPRINTS("SW_PU: val=0x%02x (rv=%d)", val, ret); - ret = is31fl3733b_get_config(ctx, - IS31FL3733B_FUNC_CS_PD, &val); + ret = is31fl3733b_get_config(ctx, IS31FL3733B_FUNC_CS_PD, &val); CPRINTS("CS_PD: val=0x%02x (rv=%d)", val, ret); } |