aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 12:45:14 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 12:45:14 -0500
commit3d50337f62a61027f40ad4ceddefa3c91e5d479e (patch)
treec89bed784ab0fc402e9f4155f500170c9a335949 /arch
parent5b808a593588b2e6235c59fcd278791c53667787 (diff)
parentd39a7a63eb3971b1b3cc5c181ed526bf437b1c72 (diff)
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
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ixp4xx/dsmg600-setup.c4
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-setup.c6
-rw-r--r--arch/arm/mach-ixp4xx/nslu2-setup.c8
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 [] = {
71 71
72static struct gpio_led dsmg600_led_pins[] = { 72static 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
61static struct gpio_led nas100d_led_pins[] = { 61static 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
64static struct gpio_led nslu2_led_pins[] = { 64static 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 },