diff options
| author | jimmy.wu <jimmy.wu@lcfc.corp-partner.google.com> | 2022-08-03 16:10:53 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-03 10:30:14 +0000 |
| commit | 41cc2be865b0e7d20029358fdceee7dd700b4441 (patch) | |
| tree | e3e73228741ef924f8b7c5213a6e33c62ea1d91d | |
| parent | f9ea85b17e81091bff80c5cbfc44c536c1647872 (diff) | |
| download | chrome-ec-41cc2be865b0e7d20029358fdceee7dd700b4441.tar.gz | |
pujjo: Change power LED from pwm to gpio
Remove power LED from pwm led node,
change it into gpio control.
BUG=b:240087038
TEST=zmake build pujjo
BRANCH=none
Signed-off-by: jimmy.wu <jimmy.wu@lcfc.corp-partner.google.com>
Change-Id: Ic279a94f48197ff2e67542bfda4902aa9f4ab760
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3807285
Reviewed-by: Andrew McRae <amcrae@google.com>
| -rw-r--r-- | zephyr/projects/nissa/pujjo/overlay.dts | 3 | ||||
| -rw-r--r-- | zephyr/projects/nissa/pujjo/pwm_leds.dts | 32 | ||||
| -rw-r--r-- | zephyr/projects/nissa/pujjo/src/led.c | 9 |
3 files changed, 18 insertions, 26 deletions
diff --git a/zephyr/projects/nissa/pujjo/overlay.dts b/zephyr/projects/nissa/pujjo/overlay.dts index 549ea7af16..ae04f21ab0 100644 --- a/zephyr/projects/nissa/pujjo/overlay.dts +++ b/zephyr/projects/nissa/pujjo/overlay.dts @@ -117,6 +117,9 @@ gpios = <&gpio6 3 GPIO_OUTPUT>; no-auto-init; }; + gpio_power_led: power_led { + gpios = <&gpioc 2 GPIO_OUTPUT_LOW>; + }; }; /* diff --git a/zephyr/projects/nissa/pujjo/pwm_leds.dts b/zephyr/projects/nissa/pujjo/pwm_leds.dts index fe8b9b9b9a..757a2dc306 100644 --- a/zephyr/projects/nissa/pujjo/pwm_leds.dts +++ b/zephyr/projects/nissa/pujjo/pwm_leds.dts @@ -7,28 +7,23 @@ pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm2 2 PWM_HZ(324) PWM_POLARITY_INVERTED>, + pwms = <&pwm2 1 PWM_HZ(324) PWM_POLARITY_INVERTED>, <&pwm0 0 PWM_HZ(324) PWM_POLARITY_INVERTED>; }; - pwm_led1: pwm_led_1 { - pwms = <&pwm1 1 PWM_HZ(324) PWM_POLARITY_INVERTED>; - }; }; cros-pwmleds { compatible = "cros-ec,pwm-leds"; - leds = <&pwm_led0 &pwm_led1>; + leds = <&pwm_led0>; - /*<red green blue>*/ - color-map-red = <100 0 0>; - color-map-green = < 0 100 0>; - color-map-blue = < 0 0 100>; - color-map-yellow = < 0 50 50>; - color-map-white = <100 100 100>; - color-map-amber = <100 20 100>; + /*<red green>*/ + color-map-red = <100 0>; + color-map-green = < 0 100>; + color-map-amber = <100 60>; - brightness-range = <100 100 100 0 0 0>; + /* brightness-range = <red green blue yellow white amber> */ + brightness-range = <100 100 0 0 0 0>; #address-cells = <1>; #size-cells = <0>; @@ -37,10 +32,6 @@ reg = <0>; ec-led-name = "EC_LED_ID_BATTERY_LED"; }; - pwm_led_1@1 { - reg = <1>; - ec-led-name = "EC_LED_ID_POWER_LED"; - }; }; }; @@ -53,13 +44,6 @@ pinctrl-names = "default"; }; -&pwm1 { - status = "okay"; - clock-bus = "NPCX_CLOCK_BUS_LFCLK"; - pinctrl-0 = <&pwm1_gpc2>; - pinctrl-names = "default"; -}; - &pwm2 { status = "okay"; clock-bus = "NPCX_CLOCK_BUS_LFCLK"; diff --git a/zephyr/projects/nissa/pujjo/src/led.c b/zephyr/projects/nissa/pujjo/src/led.c index dcf3a6a439..42433706a4 100644 --- a/zephyr/projects/nissa/pujjo/src/led.c +++ b/zephyr/projects/nissa/pujjo/src/led.c @@ -10,6 +10,9 @@ #include "led_onoff_states.h" #include "led_pwm.h" +#define PWR_LED_ON_LVL 1 +#define PWR_LED_OFF_LVL 0 + __override const int led_charge_lvl_1 = 5; __override const int led_charge_lvl_2 = 97; __override struct led_descriptor @@ -49,10 +52,12 @@ __override const struct led_descriptor __override void led_set_color_power(enum ec_led_colors color) { if (color == EC_LED_COLOR_WHITE) - set_pwm_led_color(EC_LED_ID_POWER_LED, EC_LED_COLOR_WHITE); + gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_power_led), + PWR_LED_ON_LVL); else /* LED_OFF and unsupported colors */ - set_pwm_led_color(EC_LED_ID_POWER_LED, -1); + gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_power_led), + PWR_LED_OFF_LVL); } __override void led_set_color_battery(enum ec_led_colors color) |