diff options
author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:19:30 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:05 +0000 |
commit | c8af732351cc5c7167f27e8390e26f0556f53a5a (patch) | |
tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /driver/led | |
parent | af25602b15b22b9ef5821dcba9934311f2157c48 (diff) | |
download | chrome-ec-c8af732351cc5c7167f27e8390e26f0556f53a5a.tar.gz |
Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main
This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'driver/led')
-rw-r--r-- | driver/led/aw20198.c | 4 | ||||
-rw-r--r-- | driver/led/is31fl3733b.c | 3 | ||||
-rw-r--r-- | driver/led/is31fl3743b.c | 4 | ||||
-rw-r--r-- | driver/led/lm3509.c | 11 | ||||
-rw-r--r-- | driver/led/mp3385.h | 2 | ||||
-rw-r--r-- | driver/led/oz554.h | 2 | ||||
-rw-r--r-- | driver/led/tlc59116f.c | 4 |
7 files changed, 20 insertions, 10 deletions
diff --git a/driver/led/aw20198.c b/driver/led/aw20198.c index eca596d62e..e2eea69481 100644 --- a/driver/led/aw20198.c +++ b/driver/led/aw20198.c @@ -2,6 +2,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include <string.h> + #include "aw20198.h" #include "common.h" #include "console.h" @@ -11,8 +13,6 @@ #include "stddef.h" #include "timer.h" -#include <string.h> - #define CPRINTF(fmt, args...) cprintf(CC_RGBKBD, "AW20198: " fmt, ##args) #define CPRINTS(fmt, args...) cprints(CC_RGBKBD, "AW20198: " fmt, ##args) diff --git a/driver/led/is31fl3733b.c b/driver/led/is31fl3733b.c index 3ff0c19655..33004d1cec 100644 --- a/driver/led/is31fl3733b.c +++ b/driver/led/is31fl3733b.c @@ -2,6 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include <string.h> #include "common.h" #include "console.h" #include "gpio.h" @@ -10,8 +11,6 @@ #include "stddef.h" #include "timer.h" -#include <string.h> - #define CPRINTF(fmt, args...) cprintf(CC_RGBKBD, "RGBKBD: " fmt, ##args) #define CPRINTS(fmt, args...) cprints(CC_RGBKBD, "RGBKBD: " fmt, ##args) diff --git a/driver/led/is31fl3743b.c b/driver/led/is31fl3743b.c index 6725c1d406..5eef21c388 100644 --- a/driver/led/is31fl3743b.c +++ b/driver/led/is31fl3743b.c @@ -2,6 +2,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include <string.h> + #include "common.h" #include "console.h" #include "gpio.h" @@ -10,8 +12,6 @@ #include "stddef.h" #include "timer.h" -#include <string.h> - #define CPRINTF(fmt, args...) cprintf(CC_RGBKBD, "RGBKBD: " fmt, ##args) #define CPRINTS(fmt, args...) cprints(CC_RGBKBD, "RGBKBD: " fmt, ##args) diff --git a/driver/led/lm3509.c b/driver/led/lm3509.c index 81dd940c4f..5df604bac6 100644 --- a/driver/led/lm3509.c +++ b/driver/led/lm3509.c @@ -70,6 +70,16 @@ static int lm3509_set_brightness(int percent) return lm3509_write(LM3509_REG_BMAIN, brightness_to_bmain(percent)); } +static int lm3509_get_brightness(void) +{ + int rv, val; + rv = lm3509_read(LM3509_REG_BMAIN, &val); + if (rv) + return -1; + val &= LM3509_BMAIN_MASK; + return lm3509_brightness[val] / 10; +} + static int lm3509_init(void) { return EC_SUCCESS; @@ -78,6 +88,7 @@ static int lm3509_init(void) const struct kblight_drv kblight_lm3509 = { .init = lm3509_init, .set = lm3509_set_brightness, + .get = lm3509_get_brightness, .enable = lm3509_power, .get_enabled = lm3509_get_power, }; diff --git a/driver/led/mp3385.h b/driver/led/mp3385.h index 2f179666d8..733a8f76cd 100644 --- a/driver/led/mp3385.h +++ b/driver/led/mp3385.h @@ -8,8 +8,8 @@ #ifndef __CROS_EC_MP3385_H #define __CROS_EC_MP3385_H -#include "common.h" #include "gpio.h" +#include "common.h" /* * Overridable board initialization. Should be overridden by a board diff --git a/driver/led/oz554.h b/driver/led/oz554.h index 27b43a1300..c735f9f3b9 100644 --- a/driver/led/oz554.h +++ b/driver/led/oz554.h @@ -8,8 +8,8 @@ #ifndef __CROS_EC_OZ554_H #define __CROS_EC_OZ554_H -#include "common.h" #include "gpio.h" +#include "common.h" /* * Overridable board initialization. Should be overridden by a board diff --git a/driver/led/tlc59116f.c b/driver/led/tlc59116f.c index 72e51e3fb8..1350602f6f 100644 --- a/driver/led/tlc59116f.c +++ b/driver/led/tlc59116f.c @@ -2,6 +2,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include <string.h> + #include "common.h" #include "console.h" #include "i2c.h" @@ -9,8 +11,6 @@ #include "stddef.h" #include "tlc59116f.h" -#include <string.h> - #define CPRINTF(fmt, args...) cprintf(CC_RGBKBD, "TLC59116F: " fmt, ##args) #define CPRINTS(fmt, args...) cprints(CC_RGBKBD, "TLC59116F: " fmt, ##args) |