Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f07fb521 authored by Kim, Milo's avatar Kim, Milo Committed by Bryan Wu
Browse files

leds: move LED trigger drivers into new subdirectory 



For better driver management, new subdirectory, 'trigger' is created.
All LED trigger drivers are moved into this directory.

Internal header, 'leds.h' is included in each LED trigger drivers.
Fix the location of header file, "leds.h" -> "../leds.h" in driver files.
One exception is here, 'ledtrig-timer.c'.
There is no need to include 'leds.h'. so '#include "leds.h"' line was removed.

Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: default avatarBryan Wu <cooloney@gmail.com>
parent ff45262a

drivers/leds/Kconfig

+1 −100
Original line number Original line Diff line number Diff line
@@ -479,106 +479,7 @@ config LEDS_BLINKM 
	  This option enables support for the BlinkM RGB LED connected

	  This option enables support for the BlinkM RGB LED connected

	  through I2C. Say Y to enable support for the BlinkM LED.

	  through I2C. Say Y to enable support for the BlinkM LED.





config LEDS_TRIGGERS

	bool "LED Trigger support"

	depends on LEDS_CLASS

	help

	  This option enables trigger support for the leds class.

	  These triggers allow kernel events to drive the LEDs and can

	  be configured via sysfs. If unsure, say Y.



comment "LED Triggers"

comment "LED Triggers"



source "drivers/leds/trigger/Kconfig"

config LEDS_TRIGGER_TIMER

	tristate "LED Timer Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by a programmable timer

	  via sysfs. Some LED hardware can be programmed to start

	  blinking the LED without any further software interaction.

	  For more details read Documentation/leds/leds-class.txt.



	  If unsure, say Y.



config LEDS_TRIGGER_ONESHOT

	tristate "LED One-shot Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to blink in one-shot pulses with parameters

	  controlled via sysfs.  It's useful to notify the user on

	  sporadic events, when there are no clear begin and end trap points,

	  or on dense events, where this blinks the LED at constant rate if

	  rearmed continuously.



	  It also shows how to use the led_blink_set_oneshot() function.



	  If unsure, say Y.



config LEDS_TRIGGER_IDE_DISK

	bool "LED IDE Disk Trigger"

	depends on IDE_GD_ATA

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by IDE disk activity.

	  If unsure, say Y.



config LEDS_TRIGGER_HEARTBEAT

	tristate "LED Heartbeat Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by a CPU load average.

	  The flash frequency is a hyperbolic function of the 1-minute

	  load average.

	  If unsure, say Y.



config LEDS_TRIGGER_BACKLIGHT

	tristate "LED backlight Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled as a backlight device: they

	  turn off and on when the display is blanked and unblanked.



	  If unsure, say N.



config LEDS_TRIGGER_CPU

	bool "LED CPU Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by active CPUs. This shows

	  the active CPUs across an array of LEDs so you can see which

	  CPUs are active on the system at any given moment.



	  If unsure, say N.



config LEDS_TRIGGER_GPIO

	tristate "LED GPIO Trigger"

	depends on LEDS_TRIGGERS

	depends on GPIOLIB

	help

	  This allows LEDs to be controlled by gpio events. It's good

	  when using gpios as switches and triggering the needed LEDs

	  from there. One use case is n810's keypad LEDs that could

	  be triggered by this trigger when user slides up to show

	  keypad.



	  If unsure, say N.



config LEDS_TRIGGER_DEFAULT_ON

	tristate "LED Default ON Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be initialised in the ON state.

	  If unsure, say Y.



comment "iptables trigger is under Netfilter config (LED target)"

	depends on LEDS_TRIGGERS



config LEDS_TRIGGER_TRANSIENT

	tristate "LED Transient Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows one time activation of a transient state on

	  GPIO/PWM based hardware.

	  If unsure, say Y.





endif # NEW_LEDS
 
endif # NEW_LEDS

drivers/leds/Makefile

+1 −9
Original line number Original line Diff line number Diff line
@@ -58,12 +58,4 @@ obj-$(CONFIG_LEDS_BLINKM) += leds-blinkm.o 
obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o

obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o





# LED Triggers

# LED Triggers

obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o

obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
 
obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o

obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o

obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o

obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o

obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o

obj-$(CONFIG_LEDS_TRIGGER_CPU)		+= ledtrig-cpu.o

obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o

obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o

drivers/leds/trigger/Kconfig

0 → 100644
+103 −0
Original line number Original line Diff line number Diff line 
menuconfig LEDS_TRIGGERS

	bool "LED Trigger support"

	depends on LEDS_CLASS

	help

	  This option enables trigger support for the leds class.

	  These triggers allow kernel events to drive the LEDs and can

	  be configured via sysfs. If unsure, say Y.



if LEDS_TRIGGERS



config LEDS_TRIGGER_TIMER

	tristate "LED Timer Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by a programmable timer

	  via sysfs. Some LED hardware can be programmed to start

	  blinking the LED without any further software interaction.

	  For more details read Documentation/leds/leds-class.txt.



	  If unsure, say Y.



config LEDS_TRIGGER_ONESHOT

	tristate "LED One-shot Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to blink in one-shot pulses with parameters

	  controlled via sysfs.  It's useful to notify the user on

	  sporadic events, when there are no clear begin and end trap points,

	  or on dense events, where this blinks the LED at constant rate if

	  rearmed continuously.



	  It also shows how to use the led_blink_set_oneshot() function.



	  If unsure, say Y.



config LEDS_TRIGGER_IDE_DISK

	bool "LED IDE Disk Trigger"

	depends on IDE_GD_ATA

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by IDE disk activity.

	  If unsure, say Y.



config LEDS_TRIGGER_HEARTBEAT

	tristate "LED Heartbeat Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by a CPU load average.

	  The flash frequency is a hyperbolic function of the 1-minute

	  load average.

	  If unsure, say Y.



config LEDS_TRIGGER_BACKLIGHT

	tristate "LED backlight Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled as a backlight device: they

	  turn off and on when the display is blanked and unblanked.



	  If unsure, say N.



config LEDS_TRIGGER_CPU

	bool "LED CPU Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by active CPUs. This shows

	  the active CPUs across an array of LEDs so you can see which

	  CPUs are active on the system at any given moment.



	  If unsure, say N.



config LEDS_TRIGGER_GPIO

	tristate "LED GPIO Trigger"

	depends on LEDS_TRIGGERS

	depends on GPIOLIB

	help

	  This allows LEDs to be controlled by gpio events. It's good

	  when using gpios as switches and triggering the needed LEDs

	  from there. One use case is n810's keypad LEDs that could

	  be triggered by this trigger when user slides up to show

	  keypad.



	  If unsure, say N.



config LEDS_TRIGGER_DEFAULT_ON

	tristate "LED Default ON Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be initialised in the ON state.

	  If unsure, say Y.



comment "iptables trigger is under Netfilter config (LED target)"

	depends on LEDS_TRIGGERS



config LEDS_TRIGGER_TRANSIENT

	tristate "LED Transient Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows one time activation of a transient state on

	  GPIO/PWM based hardware.

	  If unsure, say Y.



endif # LEDS_TRIGGERS

drivers/leds/trigger/Makefile

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o

obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o

obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o

obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o

obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o

obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o

obj-$(CONFIG_LEDS_TRIGGER_CPU)		+= ledtrig-cpu.o

obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o

obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o

drivers/leds/ledtrig-backlight.c→drivers/leds/trigger/ledtrig-backlight.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/fb.h>

#include <linux/fb.h>

#include <linux/leds.h>

#include <linux/leds.h>

#include "leds.h"

#include "../leds.h"





#define BLANK		1

#define BLANK		1

#define UNBLANK		0

#define UNBLANK		0