Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754746Ab2HUJDd (ORCPT ); Tue, 21 Aug 2012 05:03:33 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:42161 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752903Ab2HUJDa convert rfc822-to-8bit (ORCPT ); Tue, 21 Aug 2012 05:03:30 -0400 From: "Kim, Milo" To: Bryan Wu CC: Richard Purdie , "linux-kernel@vger.kernel.org" , "linux-leds@vger.kernel.org" , "mathias.nyman@nokia.com" Subject: [PATCH 1/4] leds-lp5523: add channel name in the platform data Thread-Topic: [PATCH 1/4] leds-lp5523: add channel name in the platform data Thread-Index: Ac1/e8n5oMMAm/XERXqosJtmV9h97A== Date: Tue, 21 Aug 2012 09:03:12 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.34.32] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2869 Lines: 87 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 --- Documentation/leds/leds-lp5523.txt | 7 +++++-- drivers/leds/leds-lp5523.c | 10 +++++++--- include/linux/leds-lp5523.h | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Documentation/leds/leds-lp5523.txt b/Documentation/leds/leds-lp5523.txt index fad2feb..e958d9a 100644 --- a/Documentation/leds/leds-lp5523.txt +++ b/Documentation/leds/leds-lp5523.txt @@ -10,7 +10,9 @@ 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: +the led class control interface. +The name of each channel is configurable in the platform data. +If the name is NULL, channels have generic names: lp5523:channelx where x is 0...8 The chip provides 3 engines. Each engine can control channels without @@ -46,12 +48,13 @@ Note - chan_nr can have values between 0 and 8. static struct lp5523_led_config lp5523_led_config[] = { { + .name = "red", .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 fbc12ac..9fd9a92 100644 --- 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 2694289..727877f 100644 --- 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; -- 1.7.2.5 Best Regards, Milo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/