Commit 6c152bee authored by Richard Purdie's avatar Richard Purdie
Browse files

leds: Standardise LED naming scheme 



As discussed on LKML some notion of 'function' is needed in
LED naming. This patch adds this to the documentation and
standardises existing LED drivers.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
parent cec035de

Documentation/leds-class.txt

+3 −2
Original line number Diff line number Diff line
@@ -39,12 +39,13 @@ 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.





Known Issues

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,

};