diff options
| author | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2018-12-10 04:29:58 -0500 |
|---|---|---|
| committer | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2018-12-10 15:31:55 -0500 |
| commit | 02d31765bb35101d711b862fc619a49857bb9070 (patch) | |
| tree | c055c55324b7338f3c99a75c30b6f884d2c615f2 | |
| parent | c4f7bd4a42758ed42cf7f7a5fd46e0b54ce23ad2 (diff) | |
led: triggers: Add LED_INIT_DEFAULT_TRIGGER flag
Add the flag LED_INIT_DEFAULT_TRIGGER for indicating that trigger
being set is a default trigger for the LED class device, and
thus it should be initialized with settings provided in the fwnode.
Set the flag in the led_trigger_set_default(). It is expected to be
cleared in the activate() op of a trigger after trigger fwnode
initialization data is parsed and applied. This should happen only
once after LED class device registration, to allow leaving triggers
in the idle state on re-apply and let the users apply their own
settings without interference from the default ones.
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
| -rw-r--r-- | drivers/leds/led-triggers.c | 1 | ||||
| -rw-r--r-- | include/linux/leds.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 52b12e601ebe..f28ce25d24d0 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c | |||
| @@ -201,6 +201,7 @@ void led_trigger_set_default(struct led_classdev *led_cdev) | |||
| 201 | down_write(&led_cdev->trigger_lock); | 201 | down_write(&led_cdev->trigger_lock); |
| 202 | list_for_each_entry(trig, &trigger_list, next_trig) { | 202 | list_for_each_entry(trig, &trigger_list, next_trig) { |
| 203 | if (!strcmp(led_cdev->default_trigger, trig->name)) { | 203 | if (!strcmp(led_cdev->default_trigger, trig->name)) { |
| 204 | led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER; | ||
| 204 | led_trigger_set(led_cdev, trig); | 205 | led_trigger_set(led_cdev, trig); |
| 205 | break; | 206 | break; |
| 206 | } | 207 | } |
diff --git a/include/linux/leds.h b/include/linux/leds.h index 7393a316d9fa..6f05a5816371 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h | |||
| @@ -51,6 +51,7 @@ struct led_classdev { | |||
| 51 | #define LED_PANIC_INDICATOR BIT(20) | 51 | #define LED_PANIC_INDICATOR BIT(20) |
| 52 | #define LED_BRIGHT_HW_CHANGED BIT(21) | 52 | #define LED_BRIGHT_HW_CHANGED BIT(21) |
| 53 | #define LED_RETAIN_AT_SHUTDOWN BIT(22) | 53 | #define LED_RETAIN_AT_SHUTDOWN BIT(22) |
| 54 | #define LED_INIT_DEFAULT_TRIGGER BIT(23) | ||
| 54 | 55 | ||
| 55 | /* set_brightness_work / blink_timer flags, atomic, private. */ | 56 | /* set_brightness_work / blink_timer flags, atomic, private. */ |
| 56 | unsigned long work_flags; | 57 | unsigned long work_flags; |
