patches/2.6.25/ixp4xx-fix-leds-names.patch

   1 From 3c405e6eacdcba7e49f595352d53ee44e3f1692c Mon Sep 17 00:00:00 2001
   2 From: A Nonymous <a@nonymous.example>
   3 Date: Fri, 25 Jan 2008 22:52:47 +1030
   4 Subject: [PATCH] ixp4xx: Fix LED names according to API requirements
   5
   6 Signed-off-by: A Nonymous <a@nonymous.example>
   7 ---
   8  arch/arm/mach-ixp4xx/dsmg600-setup.c |    4 ++--
   9  arch/arm/mach-ixp4xx/nas100d-setup.c |    6 +++---
  10  arch/arm/mach-ixp4xx/nslu2-setup.c   |    8 ++++----
  11  3 files changed, 9 insertions(+), 9 deletions(-)
  12
  13 diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
  14 index 1909ad5..d53ec19 100644
  15 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
  16 +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
  17 @@ -51,11 +51,11 @@ static struct platform_device dsmg600_i2c_controller = {
  18
  19  static struct gpio_led dsmg600_led_pins[] = {
  20         {
  21 -               .name           = "power",
  22 +               .name           = "dsmg600:green:power",
  23                 .gpio           = DSMG600_LED_PWR_GPIO,
  24         },
  25         {
  26 -               .name           = "wlan",
  27 +               .name           = "dsmg600:green:wlan",
  28                 .gpio           = DSMG600_LED_WLAN_GPIO,
  29                 .active_low     = true,
  30         },
  31 diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
  32 index 68e18cb..80e8780 100644
  33 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c
  34 +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
  35 @@ -40,17 +40,17 @@ static struct platform_device nas100d_flash = {
  36
  37  static struct gpio_led nas100d_led_pins[] = {
  38         {
  39 -               .name           = "wlan",   /* green led */
  40 +               .name           = "nas100d:green:wlan",
  41                 .gpio           = NAS100D_LED_WLAN_GPIO,
  42                 .active_low     = true,
  43         },
  44         {
  45 -               .name           = "power",  /* blue power led (off=flashing) */
  46 +               .name           = "nas100d:blue:power",  /* (off=flashing) */
  47                 .gpio           = NAS100D_LED_PWR_GPIO,
  48                 .active_low     = true,
  49         },
  50         {
  51 -               .name           = "disk",   /* yellow led */
  52 +               .name           = "nas100d:yellow:disk",
  53                 .gpio           = NAS100D_LED_DISK_GPIO,
  54                 .active_low     = true,
  55         },
  56 diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
  57 index 6a39862..fba10dd 100644
  58 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c
  59 +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
  60 @@ -48,20 +48,20 @@ static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = {
  61
  62  static struct gpio_led nslu2_led_pins[] = {
  63         {
  64 -               .name           = "ready",  /* green led */
  65 +               .name           = "nslu2:green:ready",
  66                 .gpio           = NSLU2_LED_GRN_GPIO,
  67         },
  68         {
  69 -               .name           = "status", /* red led */
  70 +               .name           = "nslu2:red:status",
  71                 .gpio           = NSLU2_LED_RED_GPIO,
  72         },
  73         {
  74 -               .name           = "disk-1",
  75 +               .name           = "nslu2:green:disk-1",
  76                 .gpio           = NSLU2_LED_DISK1_GPIO,
  77                 .active_low     = true,
  78         },
  79         {
  80 -               .name           = "disk-2",
  81 +               .name           = "nslu2:green:disk-2",
  82                 .gpio           = NSLU2_LED_DISK2_GPIO,
  83                 .active_low     = true,
  84         },
  85 --
  86 1.5.2.5
  87