drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config

The name of each led channel can be configurable.  For the compatibility,
the name is set to default value(xx:channelN) when 'name' is not defined.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Arun MURTHY <arun.murthy@stericsson.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 15 insertions, 3 deletions

diff --git a/Documentation/leds/leds-lp5521.txt b/Documentation/leds/leds-lp5521.txt
index c4d8d151e0fe..f48ab757d120 100644
--- a/Documentation/leds/leds-lp5521.txt
+++ b/Documentation/leds/leds-lp5521.txt
@@ -43,17 +43,23 @@ Format: 10x mA i.e 10 means 1.0 mA
 example platform data:
 
 Note: chan_nr can have values between 0 and 2.
+The name of each channel can be configurable.
+If the name field is not defined, the default name will be set to 'xxxx:channelN'
+(XXXX : pdata->label or i2c client name, N : channel number)
 
 static struct lp5521_led_config lp5521_led_config[] = {
         {
+                .name = "red",
                 .chan_nr        = 0,
                 .led_current    = 50,
                 .max_current    = 130,
         }, {
+                .name = "green",
                 .chan_nr        = 1,
                 .led_current    = 0,
                 .max_current    = 130,
         }, {
+                .name = "blue",
                 .chan_nr        = 2,
                 .led_current    = 0,
                 .max_current    = 130,
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index c42c8f049565..59feecdfe3a8 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -620,10 +620,15 @@ static int __devinit lp5521_init_led(struct lp5521_led *led,
                 return -EINVAL;
         }
 
-        snprintf(name, sizeof(name), "%s:channel%d",
-                        pdata->label ?: client->name, chan);
         led->cdev.brightness_set = lp5521_set_brightness;
-        led->cdev.name = name;
+        if (pdata->led_config[chan].name) {
+                led->cdev.name = pdata->led_config[chan].name;
+        } else {
+                snprintf(name, sizeof(name), "%s:channel%d",
+                        pdata->label ?: client->name, chan);
+                led->cdev.name = name;
+        }
+
         res = led_classdev_register(dev, &led->cdev);
         if (res < 0) {
                 dev_err(dev, "couldn't register led on channel %d\n", chan);
diff --git a/include/linux/leds-lp5521.h b/include/linux/leds-lp5521.h
index fd548d2a8775..e675b8d4c7bf 100644
--- a/include/linux/leds-lp5521.h
+++ b/include/linux/leds-lp5521.h
@@ -26,6 +26,7 @@
 /* See Documentation/leds/leds-lp5521.txt */
 
 struct lp5521_led_config {
+        char            *name;
         u8              chan_nr;
         u8              led_current; /* mA x10, 0 if led is not connected */
         u8              max_current;