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 22:08:58 +0000 |
| commit | 042c4201dd8b763cefd2fdbd952463f0a9845ab2 (patch) | |
| tree | 432d94f17d283e3cc8d2a0632baae4f299a87d49 | |
| parent | 62cf5a2462e754f47c300fab75053db691171f3d (diff) | |
| download | chrome-ec-042c4201dd8b763cefd2fdbd952463f0a9845ab2.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/+/1680667
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 | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/board/nami/board.c b/board/nami/board.c index 4ed6619d34..e5b5e6af44 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -1095,6 +1095,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: @@ -1104,8 +1107,6 @@ void board_kblight_init(void) kblight_register(&kblight_lm3509); break; case PROJECT_SONA: - if (sku == 0x3AE2) - break; #ifdef CONFIG_PWM_KBLIGHT kblight_register(&kblight_pwm); #endif diff --git a/board/nami/board.h b/board/nami/board.h index 16f4cb9521..d5b6534427 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -305,10 +305,11 @@ 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_PYKE (1 << 24) +#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) +#define SKU_ID_MASK_PYKE BIT(24) /* TODO(crosbug.com/p/61098): Verify the numbers below. */ /* |