diff options
-rw-r--r-- | zephyr/test/drivers/CMakeLists.txt | 4 | ||||
-rw-r--r-- | zephyr/test/drivers/Kconfig | 3 | ||||
-rw-r--r-- | zephyr/test/drivers/boards/native_posix.overlay | 100 | ||||
-rw-r--r-- | zephyr/test/drivers/common/CMakeLists.txt | 3 | ||||
-rw-r--r-- | zephyr/test/drivers/default/CMakeLists.txt | 1 | ||||
-rw-r--r-- | zephyr/test/drivers/default/prj.conf (renamed from zephyr/test/drivers/pwm_led_driver/prj.conf) | 0 | ||||
-rw-r--r-- | zephyr/test/drivers/default/src/led.c (renamed from zephyr/test/drivers/pwm_led_driver/src/led.c) | 0 | ||||
-rw-r--r-- | zephyr/test/drivers/led_driver/led_pins.dts | 4 | ||||
-rw-r--r-- | zephyr/test/drivers/pwm_led_driver/CMakeLists.txt | 10 | ||||
-rw-r--r-- | zephyr/test/drivers/pwm_led_driver/led_pins.dts | 108 | ||||
-rw-r--r-- | zephyr/test/drivers/testcase.yaml | 5 |
11 files changed, 108 insertions, 130 deletions
diff --git a/zephyr/test/drivers/CMakeLists.txt b/zephyr/test/drivers/CMakeLists.txt index 5890499fbb..d99c40bf41 100644 --- a/zephyr/test/drivers/CMakeLists.txt +++ b/zephyr/test/drivers/CMakeLists.txt @@ -31,9 +31,6 @@ elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-isl923x") elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-led_driver") set(CONFIG_LINK_TEST_SUITE_LED_DRIVER TRUE) add_compile_definitions(CONFIG_LINK_TEST_SUITE_LED_DRIVER=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-pwm_led_driver") - set(CONFIG_LINK_TEST_SUITE_PWM_LED_DRIVER TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_PWM_LED_DRIVER=1) elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usbc_alt_mode") set(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE TRUE) add_compile_definitions(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE=1) @@ -48,7 +45,6 @@ add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL ap_mux_control) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_CHARGESPLASH chargesplash) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_ISL923X isl923x) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_LED_DRIVER led_driver) -add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_PWM_LED_DRIVER pwm_led_driver) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK usb_malfunction_sink) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE usb_retimer_fw_update) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE usbc_alt_mode) diff --git a/zephyr/test/drivers/Kconfig b/zephyr/test/drivers/Kconfig index 2aa91b6267..bd958b1a5f 100644 --- a/zephyr/test/drivers/Kconfig +++ b/zephyr/test/drivers/Kconfig @@ -17,9 +17,6 @@ config LINK_TEST_SUITE_ISL923X config LINK_TEST_SUITE_LED_DRIVER bool "Link and test the led_driver tests" -config LINK_TEST_SUITE_PWM_LED_DRIVER - bool "Link and test the pwm_led_driver tests" - config LINK_TEST_SUITE_USB_MALFUNCTION_SINK bool "Link and test the usb_malfunction_sink tests" diff --git a/zephyr/test/drivers/boards/native_posix.overlay b/zephyr/test/drivers/boards/native_posix.overlay index 69be2cf31e..768e14fd86 100644 --- a/zephyr/test/drivers/boards/native_posix.overlay +++ b/zephyr/test/drivers/boards/native_posix.overlay @@ -772,6 +772,106 @@ cros_flash: cros-flash { compatible = "cros-ec,flash-emul"; }; + + pwms { + #address-cells = <1>; + #size-cells = <1>; + + pwm_blue_left: pwm@0 { + compatible = "cros,pwm-mock"; + reg = <0 1>; + #pwm-cells = <2>; + status = "okay"; + }; + pwm_white_left: pwm@1 { + compatible = "cros,pwm-mock"; + reg = <1 1>; + #pwm-cells = <2>; + status = "okay"; + }; + pwm_amber_right: pwm@2 { + compatible = "cros,pwm-mock"; + reg = <2 1>; + #pwm-cells = <2>; + status = "okay"; + }; + pwm_white_right: pwm@3 { + compatible = "cros,pwm-mock"; + reg = <3 1>; + #pwm-cells = <2>; + status = "okay"; + }; + }; + + pwmleds { + compatible = "cros-ec,pwm-pin-config"; + + pwmled_blue_left: pwmled_b_left { + #led-pin-cells = <1>; + pwms = <&pwm_blue_left 0 1000000>; + }; + pwmled_white_left: pwmled_w_left { + #led-pin-cells = <1>; + pwms = <&pwm_white_left 0 1000000>; + }; + pwmled_amber_right: pwmled_y_right { + #led-pin-cells = <1>; + pwms = <&pwm_amber_right 0 1000000>; + }; + pwmled_white_right: pwmled_w_right { + #led-pin-cells = <1>; + pwms = <&pwm_white_right 0 1000000>; + }; + }; + + pwm-led-pins { + compatible = "cros-ec,pwm-led-pins"; + + color-off-left { + led-color = "LED_OFF"; + led-id = "EC_LED_ID_LEFT_LED"; + led-pins = <&pwmled_blue_left 0>, + <&pwmled_white_left 0>; + }; + color-off-right { + led-color = "LED_OFF"; + led-id = "EC_LED_ID_RIGHT_LED"; + led-pins = <&pwmled_amber_right 0>, + <&pwmled_white_right 0>; + }; + color-blue-left { + led-color = "LED_BLUE"; + led-id = "EC_LED_ID_LEFT_LED"; + br-color = "EC_LED_COLOR_BLUE"; + led-pins = <&pwmled_blue_left 100>, + <&pwmled_white_left 0>; + }; + color-amber-right { + led-color = "LED_AMBER"; + led-id = "EC_LED_ID_RIGHT_LED"; + br-color = "EC_LED_COLOR_AMBER"; + led-pins = <&pwmled_amber_right 100>, + <&pwmled_white_right 0>; + }; + color-white-left { + led-color = "LED_WHITE"; + led-id = "EC_LED_ID_LEFT_LED"; + br-color = "EC_LED_COLOR_WHITE"; + led-pins = <&pwmled_blue_left 0>, + <&pwmled_white_left 100>; + }; + color-white-right { + led-color = "LED_WHITE"; + led-id = "EC_LED_ID_RIGHT_LED"; + br-color = "EC_LED_COLOR_WHITE"; + led-pins = <&pwmled_amber_right 0>, + <&pwmled_white_right 100>; + }; + }; + + led-colors { + compatible = "cros-ec,led-policy"; + }; }; &espi0 { diff --git a/zephyr/test/drivers/common/CMakeLists.txt b/zephyr/test/drivers/common/CMakeLists.txt index 965c58e7f8..854294ab11 100644 --- a/zephyr/test/drivers/common/CMakeLists.txt +++ b/zephyr/test/drivers/common/CMakeLists.txt @@ -9,4 +9,5 @@ target_sources(app PRIVATE target_include_directories(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${PLATFORM_EC}/driver/ppc/ -)
\ No newline at end of file + ${PLATFORM_EC}/zephyr/shim/src/led_driver +) diff --git a/zephyr/test/drivers/default/CMakeLists.txt b/zephyr/test/drivers/default/CMakeLists.txt index fd6fd1e1e9..470437a75d 100644 --- a/zephyr/test/drivers/default/CMakeLists.txt +++ b/zephyr/test/drivers/default/CMakeLists.txt @@ -45,6 +45,7 @@ target_sources(app PRIVATE src/i2c_passthru.c src/isl923x.c src/keyboard_scan.c + src/led.c src/lid_switch.c src/lis2dw12.c src/ln9310.c diff --git a/zephyr/test/drivers/pwm_led_driver/prj.conf b/zephyr/test/drivers/default/prj.conf index 9556721725..9556721725 100644 --- a/zephyr/test/drivers/pwm_led_driver/prj.conf +++ b/zephyr/test/drivers/default/prj.conf diff --git a/zephyr/test/drivers/pwm_led_driver/src/led.c b/zephyr/test/drivers/default/src/led.c index 3b3a970ae6..3b3a970ae6 100644 --- a/zephyr/test/drivers/pwm_led_driver/src/led.c +++ b/zephyr/test/drivers/default/src/led.c diff --git a/zephyr/test/drivers/led_driver/led_pins.dts b/zephyr/test/drivers/led_driver/led_pins.dts index 0127d762b2..2378d79803 100644 --- a/zephyr/test/drivers/led_driver/led_pins.dts +++ b/zephyr/test/drivers/led_driver/led_pins.dts @@ -7,6 +7,10 @@ * Modified led-colors to obtain better test coverage. */ / { + pwm-led-pins { + status = "disabled"; + }; + gpio-led-pins { compatible = "cros-ec,gpio-led-pins"; diff --git a/zephyr/test/drivers/pwm_led_driver/CMakeLists.txt b/zephyr/test/drivers/pwm_led_driver/CMakeLists.txt deleted file mode 100644 index 3e4f48724d..0000000000 --- a/zephyr/test/drivers/pwm_led_driver/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -# 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. - -# Add include paths -target_include_directories(app PRIVATE - "${PLATFORM_EC}/zephyr/shim/src/led_driver") - -# Add source files -target_sources(app PRIVATE src/led.c) diff --git a/zephyr/test/drivers/pwm_led_driver/led_pins.dts b/zephyr/test/drivers/pwm_led_driver/led_pins.dts deleted file mode 100644 index 5455a21bef..0000000000 --- a/zephyr/test/drivers/pwm_led_driver/led_pins.dts +++ /dev/null @@ -1,108 +0,0 @@ -/* 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. - */ - -#include <zephyr/dt-bindings/pwm/pwm.h> - -/ { - pwms { - #address-cells = <1>; - #size-cells = <1>; - - pwm_blue_left: pwm@0 { - compatible = "cros,pwm-mock"; - reg = <0 1>; - #pwm-cells = <2>; - status = "okay"; - }; - pwm_white_left: pwm@1 { - compatible = "cros,pwm-mock"; - reg = <1 1>; - #pwm-cells = <2>; - status = "okay"; - }; - pwm_amber_right: pwm@2 { - compatible = "cros,pwm-mock"; - reg = <2 1>; - #pwm-cells = <2>; - status = "okay"; - }; - pwm_white_right: pwm@3 { - compatible = "cros,pwm-mock"; - reg = <3 1>; - #pwm-cells = <2>; - status = "okay"; - }; - }; - - pwmleds { - compatible = "cros-ec,pwm-pin-config"; - - pwmled_blue_left: pwmled_b_left { - #led-pin-cells = <1>; - pwms = <&pwm_blue_left 0 1000000>; - }; - pwmled_white_left: pwmled_w_left { - #led-pin-cells = <1>; - pwms = <&pwm_white_left 0 1000000>; - }; - pwmled_amber_right: pwmled_y_right { - #led-pin-cells = <1>; - pwms = <&pwm_amber_right 0 1000000>; - }; - pwmled_white_right: pwmled_w_right { - #led-pin-cells = <1>; - pwms = <&pwm_white_right 0 1000000>; - }; - }; - - pwm-led-pins { - compatible = "cros-ec,pwm-led-pins"; - - color_off_left: color-off-left { - led-color = "LED_OFF"; - led-id = "EC_LED_ID_LEFT_LED"; - led-pins = <&pwmled_blue_left 0>, - <&pwmled_white_left 0>; - }; - color_off_right: color-off-right { - led-color = "LED_OFF"; - led-id = "EC_LED_ID_RIGHT_LED"; - led-pins = <&pwmled_amber_right 0>, - <&pwmled_white_right 0>; - }; - color_blue_left: color-blue-left { - led-color = "LED_BLUE"; - led-id = "EC_LED_ID_LEFT_LED"; - br-color = "EC_LED_COLOR_BLUE"; - led-pins = <&pwmled_blue_left 100>, - <&pwmled_white_left 0>; - }; - color_amber_right: color-amber-right { - led-color = "LED_AMBER"; - led-id = "EC_LED_ID_RIGHT_LED"; - br-color = "EC_LED_COLOR_AMBER"; - led-pins = <&pwmled_amber_right 100>, - <&pwmled_white_right 0>; - }; - color_white_left: color-white-left { - led-color = "LED_WHITE"; - led-id = "EC_LED_ID_LEFT_LED"; - br-color = "EC_LED_COLOR_WHITE"; - led-pins = <&pwmled_blue_left 0>, - <&pwmled_white_left 100>; - }; - color_white_right: color-white-right { - led-color = "LED_WHITE"; - led-id = "EC_LED_ID_RIGHT_LED"; - br-color = "EC_LED_COLOR_WHITE"; - led-pins = <&pwmled_amber_right 0>, - <&pwmled_white_right 100>; - }; - }; - - led-colors { - compatible = "cros-ec,led-policy"; - }; -}; diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml index 29c61d733d..a9aa233f0a 100644 --- a/zephyr/test/drivers/testcase.yaml +++ b/zephyr/test/drivers/testcase.yaml @@ -3,6 +3,7 @@ common: tests: drivers.default: timeout: 120 + extra_args: CONF_FILE="prj.conf;default/prj.conf" extra_configs: - CONFIG_LINK_TEST_SUITE_DEFAULT=y - CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK=y @@ -20,10 +21,6 @@ tests: extra_args: CONF_FILE="prj.conf;led_driver/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./led_driver/led_pins.dts;./led_driver/led_policy.dts" extra_configs: - CONFIG_LINK_TEST_SUITE_LED_DRIVER=y - drivers.pwm_led_driver: - extra_args: CONF_FILE="prj.conf;pwm_led_driver/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./pwm_led_driver/led_pins.dts" - extra_configs: - - CONFIG_LINK_TEST_SUITE_PWM_LED_DRIVER=y drivers.usb_retimer_fw_update: extra_args: CONF_FILE="prj.conf;usb_retimer_fw_update/prj.conf" extra_configs: |