diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 12:22:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 12:22:41 -0800 |
| commit | 50081e437872e68300750068754f21d0faac5d86 (patch) | |
| tree | cf8cf8bcf438c722bddc03482a4190e606984275 /drivers/leds/trigger/Kconfig | |
| parent | 7b1cd95d65eb3b1e13f8a90eb757e0ea232c7899 (diff) | |
| parent | 6a836631e303cec7fd9469ae53a4d97d0360eb38 (diff) | |
| download | linux-50081e437872e68300750068754f21d0faac5d86.tar.bz2 | |
Merge tag 'leds_for_4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
Pull LED updates from Jacek Anaszewski:
"New LED class driver:
- introduce LM3692x dual string driver
New LED trigger:
- introduce a NETDEV trigger
leds-lp8860:
- various fixes to align with LED framework
- add regulator enable during init
- DT support related improvements
Minor fixes and cleanups to the LED class drivers:
- leds-pwm
- ledtrig-activity
- leds-blinkm
- leds-as3645a
- ledtrig-transient"
* tag 'leds_for_4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
leds: ledtrig-transient: Add SPDX license identifiers
leds: lp8860: Various fixes to align with LED framework
leds: lp8860: Add DT parsing to retrieve the trigger node
dt: bindings: lp8860: Add trigger binding to the lp8860
leds: lp8860: Update the dt parsing for LED labeling
dt: bindings: lp8860: Update DT label binding
dt: bindings: lp8860: Update bindings for lp8860
leds: as3645a: Fix line over 80 characters
leds: as3645a: Fix quoted string split warning
leds: lm3692x: Introduce LM3692x dual string driver
dt: bindings: lm3692x: Add bindings for lm3692x LED driver
leds: trigger: Introduce a NETDEV trigger
leds: blinkm: avoid uninitialized data use
ledtrig-activity: Grammar s/a immediate/an immediate/
leds: pwm: Remove unneeded header file
leds: lp8860: Add regulator enable during init
leds: lp8860: Fix linuxdoc format for structure
Diffstat (limited to 'drivers/leds/trigger/Kconfig')
| -rw-r--r-- | drivers/leds/trigger/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig index bb090216b4dc..a2559b4fdfff 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig @@ -81,7 +81,7 @@ config LEDS_TRIGGER_ACTIVITY tristate "LED activity Trigger" depends on LEDS_TRIGGERS help - This allows LEDs to be controlled by a immediate CPU usage. + This allows LEDs to be controlled by an immediate CPU usage. The flash frequency and duty cycle varies from faint flashes to intense brightness depending on the instant CPU load. If unsure, say N. @@ -135,4 +135,11 @@ config LEDS_TRIGGER_PANIC a different trigger. If unsure, say Y. +config LEDS_TRIGGER_NETDEV + tristate "LED Netdev Trigger" + depends on NET && LEDS_TRIGGERS + help + This allows LEDs to be controlled by network device activity. + If unsure, say Y. + endif # LEDS_TRIGGERS |