diff options
-rw-r--r-- | board/ambassador/board.c | 6 | ||||
-rw-r--r-- | board/ambassador/board.h | 2 | ||||
-rw-r--r-- | board/ambassador/gpio.inc | 2 | ||||
-rw-r--r-- | board/ambassador/led.c | 34 |
4 files changed, 22 insertions, 22 deletions
diff --git a/board/ambassador/board.c b/board/ambassador/board.c index 303baa003b..fd6c045d4d 100644 --- a/board/ambassador/board.c +++ b/board/ambassador/board.c @@ -256,11 +256,11 @@ const struct pwm_t pwm_channels[] = { .flags = PWM_CONFIG_OPEN_DRAIN, .freq = 25000}, [PWM_CH_LED_RED] = { .channel = 0, - .flags = PWM_CONFIG_ACTIVE_LOW | + .flags = PWM_CONFIG_OPEN_DRAIN | PWM_CONFIG_DSLEEP, .freq = 2000 }, - [PWM_CH_LED_GREEN] = { .channel = 2, - .flags = PWM_CONFIG_ACTIVE_LOW | + [PWM_CH_LED_WHITE] = { .channel = 2, + .flags = PWM_CONFIG_OPEN_DRAIN | PWM_CONFIG_DSLEEP, .freq = 2000 }, }; diff --git a/board/ambassador/board.h b/board/ambassador/board.h index 26718e50ff..ebaf8201ce 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -203,7 +203,7 @@ enum adc_channel { enum pwm_channel { PWM_CH_FAN, PWM_CH_LED_RED, - PWM_CH_LED_GREEN, + PWM_CH_LED_WHITE, /* Number of PWM channels */ PWM_CH_COUNT }; diff --git a/board/ambassador/gpio.inc b/board/ambassador/gpio.inc index 7876786f38..9d718bb110 100644 --- a/board/ambassador/gpio.inc +++ b/board/ambassador/gpio.inc @@ -129,7 +129,7 @@ ALTERNATE(PIN_MASK(B, 0x0C), 0, MODULE_I2C, 0) /* I2C7 */ /* PWM */ ALTERNATE(PIN_MASK(C, 0x08), 0, MODULE_PWM, 0) /* PWM0 - Red Led */ -ALTERNATE(PIN_MASK(C, 0x10), 0, MODULE_PWM, 0) /* PWM2 - Green Led */ +ALTERNATE(PIN_MASK(C, 0x10), 0, MODULE_PWM, 0) /* PWM2 - White Led */ ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PWM5 - Fan 1 */ ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0) /* TA2 - Fan Tachometer */ diff --git a/board/ambassador/led.c b/board/ambassador/led.c index e8a506e064..659a63a483 100644 --- a/board/ambassador/led.c +++ b/board/ambassador/led.c @@ -34,7 +34,7 @@ const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); enum led_color { LED_OFF = 0, LED_RED, - LED_GREEN, + LED_WHITE, LED_AMBER, /* Number of colors, not a color itself */ @@ -43,7 +43,7 @@ enum led_color { static int set_color_power(enum led_color color, int duty) { - int green = 0; + int white = 0; int red = 0; if (duty < 0 || 100 < duty) @@ -52,15 +52,15 @@ static int set_color_power(enum led_color color, int duty) switch (color) { case LED_OFF: break; - case LED_GREEN: - green = 1; + case LED_WHITE: + white = 1; break; case LED_RED: red = 1; break; case LED_AMBER: - green = 1; red = 1; + white = 1; break; default: return EC_ERROR_UNKNOWN; @@ -71,10 +71,10 @@ static int set_color_power(enum led_color color, int duty) else pwm_set_duty(PWM_CH_LED_RED, 0); - if (green) - pwm_set_duty(PWM_CH_LED_GREEN, duty); + if (white) + pwm_set_duty(PWM_CH_LED_WHITE, duty); else - pwm_set_duty(PWM_CH_LED_GREEN, 0); + pwm_set_duty(PWM_CH_LED_WHITE, 0); return EC_SUCCESS; } @@ -142,7 +142,7 @@ static void led_tick(void) static void led_suspend(void) { - CONFIG_TICK(LED_PULSE_TICK_US, LED_GREEN); + CONFIG_TICK(LED_PULSE_TICK_US, LED_WHITE); led_tick(); } DECLARE_DEFERRED(led_suspend); @@ -181,14 +181,14 @@ static void led_resume(void) hook_call_deferred(&led_suspend_data, -1); hook_call_deferred(&led_shutdown_data, -1); if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) - set_color(EC_LED_ID_POWER_LED, LED_GREEN, 100); + set_color(EC_LED_ID_POWER_LED, LED_WHITE, 100); } DECLARE_HOOK(HOOK_CHIPSET_RESUME, led_resume, HOOK_PRIO_DEFAULT); static void led_init(void) { pwm_enable(PWM_CH_LED_RED, 1); - pwm_enable(PWM_CH_LED_GREEN, 1); + pwm_enable(PWM_CH_LED_WHITE, 1); } DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_INIT_PWM + 1); @@ -230,8 +230,8 @@ static int command_led(int argc, char **argv) set_color(id, LED_OFF, 0); } else if (!strcasecmp(argv[1], "red")) { set_color(id, LED_RED, 100); - } else if (!strcasecmp(argv[1], "green")) { - set_color(id, LED_GREEN, 100); + } else if (!strcasecmp(argv[1], "white")) { + set_color(id, LED_WHITE, 100); } else if (!strcasecmp(argv[1], "amber")) { set_color(id, LED_AMBER, 100); } else if (!strcasecmp(argv[1], "alert")) { @@ -244,13 +244,13 @@ static int command_led(int argc, char **argv) return EC_SUCCESS; } DECLARE_CONSOLE_COMMAND(led, command_led, - "[debug|red|green|amber|off|alert|crit]", + "[debug|red|white|amber|off|alert|crit]", "Turn on/off LED."); void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) { brightness_range[EC_LED_COLOR_RED] = 100; - brightness_range[EC_LED_COLOR_GREEN] = 100; + brightness_range[EC_LED_COLOR_WHITE] = 100; brightness_range[EC_LED_COLOR_AMBER] = 100; } @@ -258,8 +258,8 @@ int led_set_brightness(enum ec_led_id id, const uint8_t *brightness) { if (brightness[EC_LED_COLOR_RED]) return set_color(id, LED_RED, brightness[EC_LED_COLOR_RED]); - else if (brightness[EC_LED_COLOR_GREEN]) - return set_color(id, LED_GREEN, brightness[EC_LED_COLOR_GREEN]); + else if (brightness[EC_LED_COLOR_WHITE]) + return set_color(id, LED_WHITE, brightness[EC_LED_COLOR_WHITE]); else if (brightness[EC_LED_COLOR_AMBER]) return set_color(id, LED_AMBER, brightness[EC_LED_COLOR_AMBER]); else |