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

Commit 3d50337f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds 

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Add HP Jornada 6xx driver
  leds: Remove the now uneeded ixp4xx driver
  leds: Add power LED to the wrap driver
  leds: Fix led-gpio active_low default brightness
  leds: hw acceleration for Clevo mail LED driver
  leds: Add support for hardware accelerated LED flashing
  leds: Standardise LED naming scheme
  leds: Add clevo notebook LED driver
parents 5b808a59 d39a7a63

Documentation/leds-class.txt

+23 −6
Original line number Diff line number Diff line
@@ -39,12 +39,33 @@ LED Device Naming 


Is currently of the form:



"devicename:colour"

"devicename:colour:function"



There have been calls for LED properties such as colour to be exported as

individual led class attributes. As a solution which doesn't incur as much

overhead, I suggest these become part of the device name. The naming scheme

above leaves scope for further attributes should they be needed.

above leaves scope for further attributes should they be needed. If sections

of the name don't apply, just leave that section blank.





Hardware accelerated blink of LEDs

==================================



Some LEDs can be programmed to blink without any CPU interaction. To

support this feature, a LED driver can optionally implement the

blink_set() function (see <linux/leds.h>). If implemeted, triggers can

attempt to use it before falling back to software timers. The blink_set()

function should return 0 if the blink setting is supported, or -EINVAL

otherwise, which means that LED blinking will be handled by software.



The blink_set() function should choose a user friendly blinking

value if it is called with *delay_on==0 && *delay_off==0 parameters. In

this case the driver should give back the chosen value through delay_on

and delay_off parameters to the leds subsystem.



Any call to the brightness_set() callback function should cancel the

previously programmed hardware blinking function so setting the brightness

to 0 can also cancel the blinking of the LED.





Known Issues
@@ -55,10 +76,6 @@ would cause nightmare dependency issues. I see this as a minor issue 
compared to the benefits the simple trigger functionality brings. The

rest of the LED subsystem can be modular.



Some leds can be programmed to flash in hardware. As this isn't a generic

LED device property, this should be exported as a device specific sysfs

attribute rather than part of the class if this functionality is required.





Future Development

==================

arch/arm/mach-ixp4xx/dsmg600-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = { 


static struct gpio_led dsmg600_led_pins[] = {

	{

		.name		= "power",

		.name		= "dsmg600:green:power",

		.gpio		= DSMG600_LED_PWR_GPIO,

	},

	{

		.name		= "wlan",

		.name		= "dsmg600:green:wlan",

		.gpio		= DSMG600_LED_WLAN_GPIO,

		.active_low	= true,

	},

arch/arm/mach-ixp4xx/nas100d-setup.c

+3 −3
Original line number Diff line number Diff line
@@ -60,17 +60,17 @@ static struct i2c_board_info __initdata nas100d_i2c_board_info [] = { 


static struct gpio_led nas100d_led_pins[] = {

	{

		.name		= "wlan",   /* green led */

		.name		= "nas100d:green:wlan",

		.gpio		= NAS100D_LED_WLAN_GPIO,

		.active_low	= true,

	},

	{

		.name		= "power",  /* blue power led (off=flashing) */

		.name		= "nas100d:blue:power",  /* (off=flashing) */

		.gpio		= NAS100D_LED_PWR_GPIO,

		.active_low	= true,

	},

	{

		.name		= "disk",   /* yellow led */

		.name		= "nas100d:yellow:disk",

		.gpio		= NAS100D_LED_DISK_GPIO,

		.active_low	= true,

	},

arch/arm/mach-ixp4xx/nslu2-setup.c

+4 −4
Original line number Diff line number Diff line
@@ -63,20 +63,20 @@ static struct i2c_board_info __initdata nslu2_i2c_board_info [] = { 


static struct gpio_led nslu2_led_pins[] = {

	{

		.name		= "ready",  /* green led */

		.name		= "nslu2:green:ready",

		.gpio		= NSLU2_LED_GRN_GPIO,

	},

	{

		.name		= "status", /* red led */

		.name		= "nslu2:red:status",

		.gpio		= NSLU2_LED_RED_GPIO,

	},

	{

		.name		= "disk-1",

		.name		= "nslu2:green:disk-1",

		.gpio		= NSLU2_LED_DISK1_GPIO,

		.active_low	= true,

	},

	{

		.name		= "disk-2",

		.name		= "nslu2:green:disk-2",

		.gpio		= NSLU2_LED_DISK2_GPIO,

		.active_low	= true,

	},

drivers/hwmon/applesmc.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static ssize_t applesmc_key_at_index_store(struct device *dev, 
}



static struct led_classdev applesmc_backlight = {

	.name			= "smc:kbd_backlight",

	.name			= "smc::kbd_backlight",

	.default_trigger	= "nand-disk",

	.brightness_set		= applesmc_brightness_set,

};