diff options
| author | Denis Brockus <dbrockus@google.com> | 2021-10-05 15:32:08 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-06 03:48:40 +0000 |
| commit | 5472b9b8ff404a70c3d3a44919c0b708f7f27ad7 (patch) | |
| tree | 1fc92f1e30f335c0cada615c6ccf726377952c2c | |
| parent | 0c2a956f4f0bffd56a9a995b00795294102ce598 (diff) | |
| download | chrome-ec-5472b9b8ff404a70c3d3a44919c0b708f7f27ad7.tar.gz | |
zephyr: add CONFIG_LED_ONOFF_STATES
Add CONFIG_PLATFORM_EC_LED_ONOFF_STATES and
CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW
BUG=none
BRANCH=none
TEST=make buildall
TEST=zmake testall
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: Iaa858b09774b4caf5fe0a2f2bba4e72532990921
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3205481
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>
Commit-Queue: Yuval Peress <peress@google.com>
| -rw-r--r-- | util/config_allowed.txt | 2 | ||||
| -rw-r--r-- | zephyr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | zephyr/Kconfig.led | 19 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 11 |
4 files changed, 32 insertions, 2 deletions
diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 3420407adc..f32725f5e4 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -613,8 +613,6 @@ CONFIG_LED_DRIVER_LM3509 CONFIG_LED_DRIVER_LM3630A CONFIG_LED_DRIVER_LP5562 CONFIG_LED_DRIVER_OZ554 -CONFIG_LED_ONOFF_STATES -CONFIG_LED_ONOFF_STATES_BAT_LOW CONFIG_LED_POLICY_STD CONFIG_LED_POWER_ACTIVE_LOW CONFIG_LED_POWER_LED diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index e896f6d841..e55db8bdf8 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -236,6 +236,8 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON "${PLATFORM_EC}/common/led_common.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_PWM "${PLATFORM_EC}/common/led_pwm.c") +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_ONOFF_STATES + "${PLATFORM_EC}/common/led_onoff_states.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LID_ANGLE "${PLATFORM_EC}/common/motion_lid.c" "${PLATFORM_EC}/common/math_util.c") diff --git a/zephyr/Kconfig.led b/zephyr/Kconfig.led index 8955675d92..5374d039d1 100644 --- a/zephyr/Kconfig.led +++ b/zephyr/Kconfig.led @@ -45,4 +45,23 @@ config PLATFORM_EC_CONSOLE_CMD_LEDTEST ledtest 0 disable endif # PLATFORM_EC_LED_PWM + +config PLATFORM_EC_LED_ONOFF_STATES + bool "EC LED On-Off States" + help + Enable EC Standard LED On-Off state code that conforms to the + Chromium OS LED On-Off state behavior. + +if PLATFORM_EC_LED_ONOFF_STATES + +config PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW + int "EC LED On-Off State Battery Low Percentage" + default 10 + help + Enable EC Standard LED On-Off bettery low percentage + for standard Chromium OS LED On-Off battery low + state behavior. + +endif # PLATFORM_EC_LED_ONOFF_STATES + endif # PLATFORM_EC_LED_COMMON diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 04d2ca1d5d..0781942ce0 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -553,6 +553,17 @@ #define CONFIG_CMD_LEDTEST #endif +#undef CONFIG_LED_ONOFF_STATES +#ifdef CONFIG_PLATFORM_EC_LED_ONOFF_STATES +#define CONFIG_LED_ONOFF_STATES +#endif + +#undef CONFIG_LED_ONOFF_STATES_BAT_LOW +#ifdef CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW +#define CONFIG_LED_ONOFF_STATES_BAT_LOW \ + CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW +#endif + #undef CONFIG_PWM_DISPLIGHT #ifdef CONFIG_PLATFORM_EC_PWM_DISPLIGHT #define CONFIG_PWM_DISPLIGHT |