diff options
author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-11-24 17:53:19 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-08 10:00:03 +0000 |
commit | be39fc4f3abd1b4a45dac57dee4960df16714a03 (patch) | |
tree | c94ee7922cd7ce8087e4fd775883a3587edc8ad2 | |
parent | dc9b358b676237c266131cdc0a287568cae715be (diff) | |
download | chrome-ec-be39fc4f3abd1b4a45dac57dee4960df16714a03.tar.gz |
zephyr: leds: select PLATFORM_EC_LED_DT automatically
Select PLATFORM_EC_LED_DT automatically when the LED policy node is find
in the devicetree. Drop the remaining LED DT options from the config
files.
BRANCH=none
BUG=none
TEST=cq dry run
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Ia406abed7e9ca36a2952c59d34daa15a9db76c0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4054627
Reviewed-by: Yuval Peress <peress@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
-rw-r--r-- | docs/zephyr/zephyr_leds.md | 1 | ||||
-rw-r--r-- | zephyr/Kconfig.led_dt | 2 | ||||
-rw-r--r-- | zephyr/program/corsola/ite_program.conf | 3 | ||||
-rw-r--r-- | zephyr/program/corsola/voltorb/project.conf | 1 | ||||
-rw-r--r-- | zephyr/program/herobrine/program.conf | 4 | ||||
-rw-r--r-- | zephyr/program/nissa/xivu/project.conf | 4 | ||||
-rw-r--r-- | zephyr/program/rex/program.conf | 3 | ||||
-rw-r--r-- | zephyr/program/skyrim/crystaldrift/project.conf | 3 | ||||
-rw-r--r-- | zephyr/program/skyrim/frostflow/project.conf | 3 | ||||
-rw-r--r-- | zephyr/program/skyrim/morthal/project.conf | 3 | ||||
-rw-r--r-- | zephyr/program/skyrim/skyrim/project.conf | 3 | ||||
-rw-r--r-- | zephyr/program/skyrim/winterhold/project.conf | 3 | ||||
-rw-r--r-- | zephyr/program/trogdor/lazor/prj.conf | 3 | ||||
-rw-r--r-- | zephyr/test/drivers/default/prj.conf | 1 | ||||
-rw-r--r-- | zephyr/test/drivers/led_driver/prj.conf | 3 |
15 files changed, 2 insertions, 38 deletions
diff --git a/docs/zephyr/zephyr_leds.md b/docs/zephyr/zephyr_leds.md index 3f57aea013..50314de365 100644 --- a/docs/zephyr/zephyr_leds.md +++ b/docs/zephyr/zephyr_leds.md @@ -28,7 +28,6 @@ Example: ``` # LED CONFIG_PLATFORM_EC_LED_COMMON=n -CONFIG_PLATFORM_EC_LED_DT=y ``` Enable other [config options](../configuration/leds.md) supported in the legacy code. diff --git a/zephyr/Kconfig.led_dt b/zephyr/Kconfig.led_dt index adedfb16b6..5f27c4b5a7 100644 --- a/zephyr/Kconfig.led_dt +++ b/zephyr/Kconfig.led_dt @@ -4,6 +4,8 @@ menuconfig PLATFORM_EC_LED_DT bool "DT LED Support" + default y + depends on DT_HAS_CROS_EC_LED_POLICY_ENABLED help Enable devicetree based LED module supporting automatic control of the battery and power LEDs. diff --git a/zephyr/program/corsola/ite_program.conf b/zephyr/program/corsola/ite_program.conf index 55aecebb90..0c2a19670b 100644 --- a/zephyr/program/corsola/ite_program.conf +++ b/zephyr/program/corsola/ite_program.conf @@ -33,9 +33,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y CONFIG_PLATFORM_EC_HOST_COMMAND_STATUS=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # Sensors CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y diff --git a/zephyr/program/corsola/voltorb/project.conf b/zephyr/program/corsola/voltorb/project.conf index c1be25bfc1..5343c7f524 100644 --- a/zephyr/program/corsola/voltorb/project.conf +++ b/zephyr/program/corsola/voltorb/project.conf @@ -26,7 +26,6 @@ CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=n # LED CONFIG_PLATFORM_EC_LED_COMMON=n CONFIG_PLATFORM_EC_LED_ONOFF_STATES=n -CONFIG_PLATFORM_EC_LED_DT=y # Keyboard CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf index babc8483c9..f4687f2d84 100644 --- a/zephyr/program/herobrine/program.conf +++ b/zephyr/program/herobrine/program.conf @@ -24,10 +24,6 @@ CONFIG_SHELL_HISTORY=y CONFIG_SHELL_TAB=y CONFIG_SHELL_TAB_AUTOCOMPLETION=y -# LED -CONFIG_PLATFORM_EC_LED_COMMON=n -CONFIG_PLATFORM_EC_LED_DT=y - # Application Processor is Qualcomm SC7280 CONFIG_AP_ARM_QUALCOMM_SC7280=y diff --git a/zephyr/program/nissa/xivu/project.conf b/zephyr/program/nissa/xivu/project.conf index d20c490c20..e0a4522d84 100644 --- a/zephyr/program/nissa/xivu/project.conf +++ b/zephyr/program/nissa/xivu/project.conf @@ -7,10 +7,6 @@ CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT_DERATE_PCT=10 -# LED -CONFIG_PLATFORM_EC_LED_COMMON=n -CONFIG_PLATFORM_EC_LED_DT=y - # USBC CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=45000 diff --git a/zephyr/program/rex/program.conf b/zephyr/program/rex/program.conf index 221f1e712b..9030d62628 100644 --- a/zephyr/program/rex/program.conf +++ b/zephyr/program/rex/program.conf @@ -59,9 +59,6 @@ CONFIG_EEPROM=y CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=y CONFIG_PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # Battery CONFIG_PLATFORM_EC_BATTERY_SMART=y CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y diff --git a/zephyr/program/skyrim/crystaldrift/project.conf b/zephyr/program/skyrim/crystaldrift/project.conf index e9339c1c3c..2fc0da7178 100644 --- a/zephyr/program/skyrim/crystaldrift/project.conf +++ b/zephyr/program/skyrim/crystaldrift/project.conf @@ -8,9 +8,6 @@ CONFIG_BOARD_CRYSTALDRIFT=y # CBI WP pin present CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # Crystaldrfit is capable of sinking 100W CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000 diff --git a/zephyr/program/skyrim/frostflow/project.conf b/zephyr/program/skyrim/frostflow/project.conf index 02da02d35d..bb9f6486d8 100644 --- a/zephyr/program/skyrim/frostflow/project.conf +++ b/zephyr/program/skyrim/frostflow/project.conf @@ -10,9 +10,6 @@ CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT_DERATE_PCT=10 CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=n -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # Frostflow is capable of sinking 45W CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=45000 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=3000 diff --git a/zephyr/program/skyrim/morthal/project.conf b/zephyr/program/skyrim/morthal/project.conf index 8a22f58ab8..6a43615134 100644 --- a/zephyr/program/skyrim/morthal/project.conf +++ b/zephyr/program/skyrim/morthal/project.conf @@ -9,9 +9,6 @@ CONFIG_BOARD_MORTHAL=y CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # Morthal is capable of sinking 100W CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000 diff --git a/zephyr/program/skyrim/skyrim/project.conf b/zephyr/program/skyrim/skyrim/project.conf index 67b3f0f142..7d26a9949c 100644 --- a/zephyr/program/skyrim/skyrim/project.conf +++ b/zephyr/program/skyrim/skyrim/project.conf @@ -8,9 +8,6 @@ CONFIG_BOARD_SKYRIM=y # CBI WP pin present CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # Skyrim is capable of sinking 100W CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000 diff --git a/zephyr/program/skyrim/winterhold/project.conf b/zephyr/program/skyrim/winterhold/project.conf index b85126bf6d..b2b4aa14e3 100644 --- a/zephyr/program/skyrim/winterhold/project.conf +++ b/zephyr/program/skyrim/winterhold/project.conf @@ -9,9 +9,6 @@ CONFIG_BOARD_WINTERHOLD=y CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y # Enable charger chip diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf index 7863c75917..a4e606c179 100644 --- a/zephyr/program/trogdor/lazor/prj.conf +++ b/zephyr/program/trogdor/lazor/prj.conf @@ -21,9 +21,6 @@ CONFIG_PLATFORM_EC_LID_SWITCH=y CONFIG_PLATFORM_EC_BACKLIGHT_LID=y CONFIG_PLATFORM_EC_POWER_BUTTON=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # PWM CONFIG_PWM=y diff --git a/zephyr/test/drivers/default/prj.conf b/zephyr/test/drivers/default/prj.conf index c544afd4e7..0cfce532cd 100644 --- a/zephyr/test/drivers/default/prj.conf +++ b/zephyr/test/drivers/default/prj.conf @@ -5,7 +5,6 @@ CONFIG_PLATFORM_EC_CMD_BUTTON=y CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC=y CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC_ALARM=y -CONFIG_PLATFORM_EC_LED_DT=y CONFIG_PLATFORM_EC_RTC=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y CONFIG_PLATFORM_EC_CONSOLE_CHANNEL=y diff --git a/zephyr/test/drivers/led_driver/prj.conf b/zephyr/test/drivers/led_driver/prj.conf index 6ab9702320..01bb9df535 100644 --- a/zephyr/test/drivers/led_driver/prj.conf +++ b/zephyr/test/drivers/led_driver/prj.conf @@ -1,6 +1,3 @@ # Copyright 2022 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - -CONFIG_PLATFORM_EC_LED_COMMON=n -CONFIG_PLATFORM_EC_LED_DT=y |