diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2019-06-27 14:44:04 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-27 21:57:18 +0000 |
| commit | bf9eae6ec8ab843c84bb21e5f360d01ee9bf8122 (patch) | |
| tree | 58de35d8bd78c50fe388bf00bdbc13cbfec58269 | |
| parent | 6bed7a6de0c5c62cd7d23fe53ad16554e1cf8087 (diff) | |
| download | chrome-ec-bf9eae6ec8ab843c84bb21e5f360d01ee9bf8122.tar.gz | |
Nami: Don't register keyboard backlight driver if not used
BIT(0) of SKU_ID indicates a keyboard backlight controller presence.
If it's not present, we shouldn't register a driver.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b/
BUG=b/78360907,b/78141647,b/76182445,b/79898204
BRANCH=Nami
TEST=buildall
Change-Id: I0288c271a844990bdf015a8aa7dc695dbe936d87
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1680666
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | board/nami/board.c | 5 | ||||
| -rw-r--r-- | board/nami/board.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/board/nami/board.c b/board/nami/board.c index 7732d35f5f..24e9ca079e 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -1069,6 +1069,9 @@ int board_is_lid_angle_tablet_mode(void) void board_kblight_init(void) { + if (!(sku & SKU_ID_MASK_KBLIGHT)) + return; + switch (oem) { default: case PROJECT_NAMI: @@ -1078,8 +1081,6 @@ void board_kblight_init(void) kblight_register(&kblight_lm3509); break; case PROJECT_SONA: - if (sku == 0x3AE2) - break; kblight_register(&kblight_pwm); break; } diff --git a/board/nami/board.h b/board/nami/board.h index 41d6070317..1b20b7baae 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -305,9 +305,10 @@ enum model_id { MODEL_BARD = 2, }; -#define SKU_ID_MASK_CONVERTIBLE (1 << 9) -#define SKU_ID_MASK_KEYPAD (1 << 15) -#define SKU_ID_MASK_UK2 (1 << 18) +#define SKU_ID_MASK_KBLIGHT BIT(0) +#define SKU_ID_MASK_CONVERTIBLE BIT(9) +#define SKU_ID_MASK_KEYPAD BIT(15) +#define SKU_ID_MASK_UK2 BIT(18) /* TODO(crosbug.com/p/61098): Verify the numbers below. */ /* |