diff options
author | Nicolas Boichat <drinkcat@chromium.org> | 2019-05-21 08:28:46 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-22 20:56:35 -0700 |
commit | 55f12ab58518fb079a99d1ce4d9717a430d7b9ce (patch) | |
tree | 989de9940f747b2e76d66c1b3bcaaacd5f893925 | |
parent | d206f9f324c52dc4b19c0fd271a536a90e2fc5ce (diff) | |
download | chrome-ec-55f12ab58518fb079a99d1ce4d9717a430d7b9ce.tar.gz |
charger/rt946x: Keep backlight in linear mode
Backlight BLEN register default (and desired) setting is to keep
backlight in linear mode ('1'), do not clear that bit when enabling
the backlight.
There is one more bit in the register (bled_config), but for that
one, the default active low setting is correct.
BRANCH=none
BUG=b:132225489
TEST=Boot krane with software sync disabled, see that default
backlight is reasonable.
Change-Id: I2e8867ee6d39e2c5eabe64719105e8f463dec2a7
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1621645
Tested-by: Fei Shao <fshao@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Yilun Lin <yllin@chromium.org>
-rw-r--r-- | driver/charger/rt946x.c | 3 | ||||
-rw-r--r-- | driver/charger/rt946x.h | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index c48746bf71..226b4b4d0a 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -464,7 +464,8 @@ static int rt946x_init_setting(void) rt946x_write8(MT6370_BACKLIGHT_BLEN, MT6370_MASK_BLED_EXT_EN | MT6370_MASK_BLED_EN | MT6370_MASK_BLED_1CH_EN | MT6370_MASK_BLED_2CH_EN | - MT6370_MASK_BLED_3CH_EN | MT6370_MASK_BLED_4CH_EN); + MT6370_MASK_BLED_3CH_EN | MT6370_MASK_BLED_4CH_EN | + MT6370_BLED_CODE_LINEAR); rt946x_update_bits(MT6370_BACKLIGHT_BLPWM, MT6370_MASK_BLPWM_BLED_PWM, BIT(MT6370_SHIFT_BLPWM_BLED_PWM)); #endif diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h index 29e36f0ac9..aad6d74032 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -500,6 +500,8 @@ #define MT6370_SHIFT_BLED_2CH_EN 4 #define MT6370_SHIFT_BLED_3CH_EN 3 #define MT6370_SHIFT_BLED_4CH_EN 2 +#define MT6370_SHIFT_BLED_CODE 1 +#define MT6370_SHIFT_BLED_CONFIG 0 #define MT6370_MASK_BLED_EXT_EN BIT(MT6370_SHIFT_BLED_EXT_EN) #define MT6370_MASK_BLED_EN BIT(MT6370_SHIFT_BLED_EN) @@ -508,6 +510,12 @@ #define MT6370_MASK_BLED_3CH_EN BIT(MT6370_SHIFT_BLED_3CH_EN) #define MT6370_MASK_BLED_4CH_EN BIT(MT6370_SHIFT_BLED_4CH_EN) +#define MT6370_BLED_CODE_LINEAR BIT(MT6370_SHIFT_BLED_CODE) +#define MT6370_BLED_CODE_EXP 0 + +#define MT6370_BLED_CONFIG_ACTIVE_HIGH BIT(MT6370_SHIFT_BLED_CONFIG) +#define MT6370_BLED_CONFIG_ACTIVE_LOW 0 + /* ========== BLPWM 0xA2 (mt6370) ============ */ #define MT6370_SHIFT_BLPWM_BLED_PWM 7 |