leds-lp5523: add channel name in the platform data

The name of each led channel is configurable.
If the name is NULL, just use the channel id for making the channel name

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>

diff --git a/Documentation/leds/leds-lp5523.txt b/Documentation/leds/leds-lp5523.txt
index fad2feb8b7ce2d394b57c8532c6858576023993a..c2743f59f9acb1ce9479ecf7e39926a9caa404a4 100644 (file)
--- a/Documentation/leds/leds-lp5523.txt
+++ b/Documentation/leds/leds-lp5523.txt
@@ -10,8 +10,22 @@ Contact: Samu Onkalo (samu.p.onkalo-at-nokia.com)
 Description
 -----------
 LP5523 can drive up to 9 channels. Leds can be controlled directly via
-the led class control interface. Channels have generic names:
-lp5523:channelx where x is 0...8
+the led class control interface.
+The name of each channel is configurable in the platform data - name and label.
+There are three options to make the channel name.
+
+a) Define the 'name' in the platform data
+To make specific channel name, then use 'name' platform data.
+/sys/class/leds/R1               (name: 'R1')
+/sys/class/leds/B1               (name: 'B1')
+
+b) Use the 'label' with no 'name' field
+For one device name with channel number, then use 'label'.
+/sys/class/leds/RGB:channelN     (label: 'RGB', N: 0 ~ 8)
+
+c) Default
+If both fields are NULL, 'lp5523' is used by default.
+/sys/class/leds/lp5523:channelN  (N: 0 ~ 8)
 
 The chip provides 3 engines. Each engine can control channels without
 interaction from the main CPU. Details of the micro engine code can be found
@@ -46,12 +60,13 @@ Note - chan_nr can have values between 0 and 8.
 
 static struct lp5523_led_config lp5523_led_config[] = {
         {
+               .name           = "D1",
                 .chan_nr        = 0,
                 .led_current    = 50,
                .max_current    = 130,
         },
 ...
-        }, {
+        {
                 .chan_nr        = 8,
                 .led_current    = 50,
                .max_current    = 130,

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index fbc12acada95a6e5507bcfada4b5bb483b67251a..9fd9a92ed916f7670871bbd734caca74f28fed36 100644 (file)
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -846,10 +846,14 @@ static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev,
                        return -EINVAL;
                }
 
-               snprintf(name, sizeof(name), "%s:channel%d",
-                       pdata->label ?: "lp5523", chan);
+               if (pdata->led_config[chan].name) {
+                       led->cdev.name = pdata->led_config[chan].name;
+               } else {
+                       snprintf(name, sizeof(name), "%s:channel%d",
+                               pdata->label ?: "lp5523", chan);
+                       led->cdev.name = name;
+               }
 
-               led->cdev.name = name;
                led->cdev.brightness_set = lp5523_set_brightness;
                res = led_classdev_register(dev, &led->cdev);
                if (res < 0) {

diff --git a/include/linux/leds-lp5523.h b/include/linux/leds-lp5523.h
index 2694289babd08bd337ce5240d6f463ec8cb28aba..727877fb406d7eb526b9ede546c8d130e32e2995 100644 (file)
--- a/include/linux/leds-lp5523.h
+++ b/include/linux/leds-lp5523.h
@@ -26,6 +26,7 @@
 /* See Documentation/leds/leds-lp5523.txt */
 
 struct lp5523_led_config {
+       const char      *name;
        u8              chan_nr;
        u8              led_current; /* mA x10, 0 if led is not connected */
        u8              max_current;