3 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 688659668bdf..8cb07437a807 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -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,
        },
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 4cecae84837b..159e1c4f1eda 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -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,
        },
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index acaebcbce53a..d9a182895a0f 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -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,
        },

diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c index 688659668bdf..8cb07437a807 100644 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -71,11 +71,11 @@ static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {
71		71
72	static struct gpio_led dsmg600_led_pins[] = {	72	static struct gpio_led dsmg600_led_pins[] = {
73	{	73	{
74	.name = "power",	74	.name = "dsmg600:green:power",
75	.gpio = DSMG600_LED_PWR_GPIO,	75	.gpio = DSMG600_LED_PWR_GPIO,
76	},	76	},
77	{	77	{
78	.name = "wlan",	78	.name = "dsmg600:green:wlan",
79	.gpio = DSMG600_LED_WLAN_GPIO,	79	.gpio = DSMG600_LED_WLAN_GPIO,
80	.active_low = true,	80	.active_low = true,
81	},	81	},


diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index 4cecae84837b..159e1c4f1eda 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -60,17 +60,17 @@ static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
60		60
61	static struct gpio_led nas100d_led_pins[] = {	61	static struct gpio_led nas100d_led_pins[] = {
62	{	62	{
63	.name = "wlan", /* green led */	63	.name = "nas100d:green:wlan",
64	.gpio = NAS100D_LED_WLAN_GPIO,	64	.gpio = NAS100D_LED_WLAN_GPIO,
65	.active_low = true,	65	.active_low = true,
66	},	66	},
67	{	67	{
68	.name = "power", /* blue power led (off=flashing) */	68	.name = "nas100d:blue:power", /* (off=flashing) */
69	.gpio = NAS100D_LED_PWR_GPIO,	69	.gpio = NAS100D_LED_PWR_GPIO,
70	.active_low = true,	70	.active_low = true,
71	},	71	},
72	{	72	{
73	.name = "disk", /* yellow led */	73	.name = "nas100d:yellow:disk",
74	.gpio = NAS100D_LED_DISK_GPIO,	74	.gpio = NAS100D_LED_DISK_GPIO,
75	.active_low = true,	75	.active_low = true,
76	},	76	},


diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c index acaebcbce53a..d9a182895a0f 100644 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -63,20 +63,20 @@ static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
63		63
64	static struct gpio_led nslu2_led_pins[] = {	64	static struct gpio_led nslu2_led_pins[] = {
65	{	65	{
66	.name = "ready", /* green led */	66	.name = "nslu2:green:ready",
67	.gpio = NSLU2_LED_GRN_GPIO,	67	.gpio = NSLU2_LED_GRN_GPIO,
68	},	68	},
69	{	69	{
70	.name = "status", /* red led */	70	.name = "nslu2:red:status",
71	.gpio = NSLU2_LED_RED_GPIO,	71	.gpio = NSLU2_LED_RED_GPIO,
72	},	72	},
73	{	73	{
74	.name = "disk-1",	74	.name = "nslu2:green:disk-1",
75	.gpio = NSLU2_LED_DISK1_GPIO,	75	.gpio = NSLU2_LED_DISK1_GPIO,
76	.active_low = true,	76	.active_low = true,
77	},	77	},
78	{	78	{
79	.name = "disk-2",	79	.name = "nslu2:green:disk-2",
80	.gpio = NSLU2_LED_DISK2_GPIO,	80	.gpio = NSLU2_LED_DISK2_GPIO,
81	.active_low = true,	81	.active_low = true,
82	},	82	},