| Message ID | 20200622185919.2131-1-dmurphy@ti.com |
|---|---|
| Headers | show |
| Series | Multicolor Framework v29 | expand |
Hi! > This is the multi color LED framework. This framework presents clustered > colored LEDs into an array and allows the user space to adjust the brightness > of the cluster using a single file write. The individual colored LEDs > intensities are controlled via a single file that is an array of LEDs > > Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. > Added update to the u8500_defconfig Marek, would you be willing to look over this series? Dan, can we please get it in the order 1) fixes first 2) changes needed for multicolor but not depending on dt acks 3) dt changes 4) rest? This is the order it should have been in the first place, and I'd like to get fixes applied, and perhaps some of the preparation. Best regards, Pavel
Pavel On 7/4/20 7:47 AM, Pavel Machek wrote: > Hi! > >> This is the multi color LED framework. This framework presents clustered >> colored LEDs into an array and allows the user space to adjust the brightness >> of the cluster using a single file write. The individual colored LEDs >> intensities are controlled via a single file that is an array of LEDs >> >> Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. >> Added update to the u8500_defconfig > Marek, would you be willing to look over this series? > > Dan, can we please get it in the order > > 1) fixes first > > 2) changes needed for multicolor but not depending on dt acks > > 3) dt changes > > 4) rest? > > This is the order it should have been in the first place, and I'd like > to get fixes applied, and perhaps some of the preparation. This will depend on if there are comments. If I have to push a v30 then I will reorder. If not then there would be no reason to re-order these. Dan
Pavel On 7/6/20 7:31 AM, Dan Murphy wrote: > Pavel > > On 7/4/20 7:47 AM, Pavel Machek wrote: >> Hi! >> >>> This is the multi color LED framework. This framework presents >>> clustered >>> colored LEDs into an array and allows the user space to adjust the >>> brightness >>> of the cluster using a single file write. The individual colored LEDs >>> intensities are controlled via a single file that is an array of LEDs >>> >>> Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. >>> Added update to the u8500_defconfig >> Marek, would you be willing to look over this series? >> >> Dan, can we please get it in the order >> >> 1) fixes first >> >> 2) changes needed for multicolor but not depending on dt acks >> >> 3) dt changes >> >> 4) rest? >> >> This is the order it should have been in the first place, and I'd like >> to get fixes applied, and perhaps some of the preparation. > > This will depend on if there are comments. If I have to push a v30 > then I will reorder. > > If not then there would be no reason to re-order these. > FYI I just reordered these locally and the fixes patches applied cleanly to your for-next branch and the MC FW patches applied cleanly on top of those. So you should be able to pull in the fixes with no dependency on the MC FW patches. If you can apply the fixes cleanly then if there are conflicts with the MC FW patches then I will fix those as well. Dan > Dan > >
Hi! > Introduce a multicolor class that groups colored LEDs > within a LED node. > +What: /sys/class/leds/<led>/multi_intensity > +Date: March 2020 > +KernelVersion: 5.8 > +Contact: Dan Murphy <dmurphy@ti.com> > +Description: read/write > + Intensity level for the LED color within an array of integers. ? "This file contains array of integers". > + The intensities for each color must be entered based on the > + multi_index array. This does not make sense to me. "Order of components is described by the multi_index array"? > The max_intensity should not exceed "max_intensity" -> "maximum intensity"? > + /sys/class/leds/<led>/max_brightness. > +Multicolor Class Brightness Control > +=================================== > +The multicolor class framework will calculate each monochrome LEDs intensity. ? > +static ssize_t multi_intensity_store(struct device *dev, > + struct device_attribute *intensity_attr, > + const char *buf, size_t size) > +{ > + struct led_classdev *led_cdev = dev_get_drvdata(dev); > + struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); > + int nrchars, offset = 0; > + int intensity_value[LED_COLOR_ID_MAX]; > + int i; > + ssize_t ret; > + > + mutex_lock(&led_cdev->led_access); > + > + for (i = 0; i < mcled_cdev->num_colors; i++) { > + ret = sscanf(buf + offset, "%i%n", > + &intensity_value[i], &nrchars); > + if (ret != 1) { > + dev_dbg(led_cdev->dev, > + "Incorrect number of LEDs expected %i values intensity was not applied\n", > + mcled_cdev->num_colors); > + ret = -EINVAL; > + goto err_out; > + } > + offset += nrchars; > + } > + > + /* account for the space at the end of the buffer */ > + offset++; space? I'd expect \n there. And it would be good to verify it is indeed \n, so that for example "0 0 0b" is not accepted. Please remove the dev_dbg()s that can be triggered by userspace. We don't want users spamming the logs. > +static ssize_t multi_intensity_show(struct device *dev, > + struct device_attribute *intensity_attr, > + char *buf) > +{ > + struct led_classdev *led_cdev = dev_get_drvdata(dev); > + struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); > + int len = 0; > + int i; > + > + for (i = 0; i < mcled_cdev->num_colors; i++) { > + len += sprintf(buf + len, "%d", > + mcled_cdev->subled_info[i].intensity); > + len += sprintf(buf + len, " "); We should not really put " " before newline. > +static ssize_t multi_index_show(struct device *dev, > + struct device_attribute *multi_index_attr, > + char *buf) > +{ > + for (i = 0; i < mcled_cdev->num_colors; i++) { > + index = mcled_cdev->subled_info[i].color_index; > + len += sprintf(buf + len, "%s", led_colors[index]); > + len += sprintf(buf + len, " "); > + } We should not really put " " before newline. > +{ > + struct led_classdev *led_cdev; > + > + if (!mcled_cdev) > + return -EINVAL; > + > + if (!mcled_cdev->num_colors) > + return -EINVAL; It is plain int, so you may want to check for <= 0? Or maybe make it unsigned? > +MODULE_LICENSE("GPL v2"); If your legal department allows that, GPL v2+ would be preffered (globally). > +struct mc_subled { > + int color_index; > + int brightness; > + int intensity; > + int channel; > +}; > + > +struct led_classdev_mc { > + /* led class device */ > + struct led_classdev led_cdev; > + int num_colors; > + > + struct mc_subled *subled_info; > +}; Would some "unsigned"s make sense here to cut number of corner cases? Best regards, Pavel
On Mon 2020-06-22 13:59:15, Dan Murphy wrote: > The dependencies for the LP55XX LED drivers have been updated so that > the child devices (i.e. LP5521) now depends on the LP55XX_COMMON config > flag as opposed to the device selecting the LP55XX_COMMON flag. The > LP55XX_COMMON needs to be set in the defconfig. > > CC: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Dan Murphy <dmurphy@ti.com> Acked-by: Pavel Machek <pavel@ucw.cz> ...but I don't think I'm right person to apply this. Best regards, Pavel
Hi! > Add the multicolor brightness call back to support the multicolor > framework. This call back allows setting brightness on grouped channels Extra space before "brightness". Best regards, Pavel
On 7/11/20 5:57 PM, Pavel Machek wrote: > Hi! > >> Add the multicolor brightness call back to support the multicolor >> framework. This call back allows setting brightness on grouped channels > > Extra space before "brightness". And before "This".
On Sat 2020-07-11 19:19:22, Jacek Anaszewski wrote: > On 7/11/20 5:57 PM, Pavel Machek wrote: > > Hi! > > > > > Add the multicolor brightness call back to support the multicolor > > > framework. This call back allows setting brightness on grouped channels > > > > Extra space before "brightness". > > And before "This". That one is intentional, I believe. https://www.independent.co.uk/life-style/gadgets-and-tech/news/one-space-or-two-spaces-after-a-full-stop-scientists-have-finally-found-the-answer-a8337646.html We are using fixed width fonts, so typewriter rules still apply here. Best regards, Pavel
On Sat 2020-07-04 14:47:29, Pavel Machek wrote: > Hi! > > > This is the multi color LED framework. This framework presents clustered > > colored LEDs into an array and allows the user space to adjust the brightness > > of the cluster using a single file write. The individual colored LEDs > > intensities are controlled via a single file that is an array of LEDs > > > > Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. > > Added update to the u8500_defconfig > > Marek, would you be willing to look over this series? > > Dan, can we please get it in the order > > 1) fixes first > > 2) changes needed for multicolor but not depending on dt acks > > 3) dt changes > > 4) rest? Actually, one more request. I believe I won't be able to take at least some of the ARM: dts stuff... not everything is acked. Please put that last. Thank you, Pavel
On 7/11/20 10:24 PM, Pavel Machek wrote: > On Sat 2020-07-11 19:19:22, Jacek Anaszewski wrote: >> On 7/11/20 5:57 PM, Pavel Machek wrote: >>> Hi! >>> >>>> Add the multicolor brightness call back to support the multicolor >>>> framework. This call back allows setting brightness on grouped channels >>> >>> Extra space before "brightness". >> >> And before "This". > > That one is intentional, I believe. > > https://www.independent.co.uk/life-style/gadgets-and-tech/news/one-space-or-two-spaces-after-a-full-stop-scientists-have-finally-found-the-answer-a8337646.html > > We are using fixed width fonts, so typewriter rules still apply here. But see the article [0]. Also, in [1], in the section "Computer era" you can find opposite examples in the modern systems. And grep returns following numbers for kernel Documentation folder: $ rgrep "[A-Za-z0-9]\. " Documentation/ | wc -l 18449 $ rgrep "[A-Za-z0-9]\. " Documentation/ | wc -l 63067 I prefer single space but will not fight for that too hard. Nonetheless, it would be good to use one style consistently, since most files I've looked at had problem with that. Both DT and LED documentation in this set is not consistent in this regard as well. [0] https://www.instructionalsolutions.com/blog/one-space-vs-two-after-period [1] https://en.wikipedia.org/wiki/Sentence_spacing
On Sat, 4 Jul 2020 14:47:29 +0200 Pavel Machek <pavel@ucw.cz> wrote: > Hi! > > > This is the multi color LED framework. This framework presents clustered > > colored LEDs into an array and allows the user space to adjust the brightness > > of the cluster using a single file write. The individual colored LEDs > > intensities are controlled via a single file that is an array of LEDs > > > > Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. > > Added update to the u8500_defconfig > > Marek, would you be willing to look over this series? Overall this series looks good to me. I wanted to apply version 29 of the patches, but I didn't receive all patches in v29 (some are missing), so I had to search for previous versions of selected patches. I have seen some typos in documentation, but that can be solved afterwards. One thing I don't like much is that in the sysfs multi_index and multi_intensity files there is a trailing space after the last color. This is not true for example for the trigger file. It is trivial to fix this, so again maybe a will send a follow-up patch after this series is accepted. Marek > Dan, can we please get it in the order > > 1) fixes first > > 2) changes needed for multicolor but not depending on dt acks > > 3) dt changes > > 4) rest? > > This is the order it should have been in the first place, and I'd like > to get fixes applied, and perhaps some of the preparation. > > Best regards, > Pavel >
Hi Dan, one bug in this driver, see below. On Mon, 22 Jun 2020 13:59:08 -0500 Dan Murphy <dmurphy@ti.com> wrote: > Introduce the LP5036/30/24/18/12/9 RGB LED driver. > The difference in these parts are the number of > LED outputs where the: > > LP5036 can control 36 LEDs > LP5030 can control 30 LEDs > LP5024 can control 24 LEDs > LP5018 can control 18 LEDs > LP5012 can control 12 LEDs > LP5009 can control 9 LEDs > > The device has the ability to group LED output into control banks > so that multiple LED banks can be controlled with the same mixing and > brightness. Inversely the LEDs can also be controlled independently. > > Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> > Signed-off-by: Dan Murphy <dmurphy@ti.com> > --- > drivers/leds/Kconfig | 11 + > drivers/leds/Makefile | 1 + > drivers/leds/leds-lp50xx.c | 783 +++++++++++++++++++++++++++++++++++++ > 3 files changed, 795 insertions(+) > create mode 100644 drivers/leds/leds-lp50xx.c > > diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig > index 0d034453eeb9..68f63d1a7d48 100644 > --- a/drivers/leds/Kconfig > +++ b/drivers/leds/Kconfig > @@ -384,6 +384,17 @@ config LEDS_LP3952 > To compile this driver as a module, choose M here: the > module will be called leds-lp3952. > > +config LEDS_LP50XX > + tristate "LED Support for TI LP5036/30/24/18/12/9 LED driver chip" > + depends on LEDS_CLASS && REGMAP_I2C > + depends on LEDS_CLASS_MULTI_COLOR || !LEDS_CLASS_MULTI_COLOR > + help > + If you say yes here you get support for the Texas Instruments > + LP5036, LP5030, LP5024, LP5018, LP5012 and LP5009 LED driver. > + > + To compile this driver as a module, choose M here: the > + module will be called leds-lp50xx. > + > config LEDS_LP55XX_COMMON > tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501" > depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501 > diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile > index 53a752c32e67..68c05faec99e 100644 > --- a/drivers/leds/Makefile > +++ b/drivers/leds/Makefile > @@ -49,6 +49,7 @@ obj-$(CONFIG_LEDS_LM3697) += leds-lm3697.o > obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o > obj-$(CONFIG_LEDS_LP3944) += leds-lp3944.o > obj-$(CONFIG_LEDS_LP3952) += leds-lp3952.o > +obj-$(CONFIG_LEDS_LP50XX) += leds-lp50xx.o > obj-$(CONFIG_LEDS_LP5521) += leds-lp5521.o > obj-$(CONFIG_LEDS_LP5523) += leds-lp5523.o > obj-$(CONFIG_LEDS_LP5562) += leds-lp5562.o > diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c > new file mode 100644 > index 000000000000..407c2f42bac2 > --- /dev/null > +++ b/drivers/leds/leds-lp50xx.c > @@ -0,0 +1,783 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// TI LP50XX LED chip family driver > +// Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ > + > +#include <linux/gpio/consumer.h> > +#include <linux/i2c.h> > +#include <linux/init.h> > +#include <linux/leds.h> > +#include <linux/module.h> > +#include <linux/mutex.h> > +#include <linux/of.h> > +#include <linux/of_gpio.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > +#include <uapi/linux/uleds.h> > + > +#include <linux/led-class-multicolor.h> > + > +#include "leds.h" > + > +#define LP50XX_DEV_CFG0 0x00 > +#define LP50XX_DEV_CFG1 0x01 > +#define LP50XX_LED_CFG0 0x02 > + > +/* LP5009 and LP5012 registers */ > +#define LP5012_BNK_BRT 0x03 > +#define LP5012_BNKA_CLR 0x04 > +#define LP5012_BNKB_CLR 0x05 > +#define LP5012_BNKC_CLR 0x06 > +#define LP5012_LED0_BRT 0x07 > +#define LP5012_LED1_BRT 0x08 > +#define LP5012_LED2_BRT 0x09 > +#define LP5012_LED3_BRT 0x0a > +#define LP5012_OUT0_CLR 0x0b > +#define LP5012_OUT1_CLR 0x0c > +#define LP5012_OUT2_CLR 0x0d > +#define LP5012_OUT3_CLR 0x0e > +#define LP5012_OUT4_CLR 0x0f > +#define LP5012_OUT5_CLR 0x10 > +#define LP5012_OUT6_CLR 0x11 > +#define LP5012_OUT7_CLR 0x12 > +#define LP5012_OUT8_CLR 0x13 > +#define LP5012_OUT9_CLR 0x14 > +#define LP5012_OUT10_CLR 0x15 > +#define LP5012_OUT11_CLR 0x16 > +#define LP5012_RESET 0x17 > + > +/* LP5018 and LP5024 registers */ > +#define LP5024_BNK_BRT 0x03 > +#define LP5024_BNKA_CLR 0x04 > +#define LP5024_BNKB_CLR 0x05 > +#define LP5024_BNKC_CLR 0x06 > +#define LP5024_LED0_BRT 0x07 > +#define LP5024_LED1_BRT 0x08 > +#define LP5024_LED2_BRT 0x09 > +#define LP5024_LED3_BRT 0x0a > +#define LP5024_LED4_BRT 0x0b > +#define LP5024_LED5_BRT 0x0c > +#define LP5024_LED6_BRT 0x0d > +#define LP5024_LED7_BRT 0x0e > + > +#define LP5024_OUT0_CLR 0x0f > +#define LP5024_OUT1_CLR 0x10 > +#define LP5024_OUT2_CLR 0x11 > +#define LP5024_OUT3_CLR 0x12 > +#define LP5024_OUT4_CLR 0x13 > +#define LP5024_OUT5_CLR 0x14 > +#define LP5024_OUT6_CLR 0x15 > +#define LP5024_OUT7_CLR 0x16 > +#define LP5024_OUT8_CLR 0x17 > +#define LP5024_OUT9_CLR 0x18 > +#define LP5024_OUT10_CLR 0x19 > +#define LP5024_OUT11_CLR 0x1a > +#define LP5024_OUT12_CLR 0x1b > +#define LP5024_OUT13_CLR 0x1c > +#define LP5024_OUT14_CLR 0x1d > +#define LP5024_OUT15_CLR 0x1e > +#define LP5024_OUT16_CLR 0x1f > +#define LP5024_OUT17_CLR 0x20 > +#define LP5024_OUT18_CLR 0x21 > +#define LP5024_OUT19_CLR 0x22 > +#define LP5024_OUT20_CLR 0x23 > +#define LP5024_OUT21_CLR 0x24 > +#define LP5024_OUT22_CLR 0x25 > +#define LP5024_OUT23_CLR 0x26 > +#define LP5024_RESET 0x27 > + > +/* LP5030 and LP5036 registers */ > +#define LP5036_LED_CFG1 0x03 > +#define LP5036_BNK_BRT 0x04 > +#define LP5036_BNKA_CLR 0x05 > +#define LP5036_BNKB_CLR 0x06 > +#define LP5036_BNKC_CLR 0x07 > +#define LP5036_LED0_BRT 0x08 > +#define LP5036_LED1_BRT 0x09 > +#define LP5036_LED2_BRT 0x0a > +#define LP5036_LED3_BRT 0x0b > +#define LP5036_LED4_BRT 0x0c > +#define LP5036_LED5_BRT 0x0d > +#define LP5036_LED6_BRT 0x0e > +#define LP5036_LED7_BRT 0x0f > +#define LP5036_LED8_BRT 0x10 > +#define LP5036_LED9_BRT 0x11 > +#define LP5036_LED10_BRT 0x12 > +#define LP5036_LED11_BRT 0x13 > + > +#define LP5036_OUT0_CLR 0x14 > +#define LP5036_OUT1_CLR 0x15 > +#define LP5036_OUT2_CLR 0x16 > +#define LP5036_OUT3_CLR 0x17 > +#define LP5036_OUT4_CLR 0x18 > +#define LP5036_OUT5_CLR 0x19 > +#define LP5036_OUT6_CLR 0x1a > +#define LP5036_OUT7_CLR 0x1b > +#define LP5036_OUT8_CLR 0x1c > +#define LP5036_OUT9_CLR 0x1d > +#define LP5036_OUT10_CLR 0x1e > +#define LP5036_OUT11_CLR 0x1f > +#define LP5036_OUT12_CLR 0x20 > +#define LP5036_OUT13_CLR 0x21 > +#define LP5036_OUT14_CLR 0x22 > +#define LP5036_OUT15_CLR 0x23 > +#define LP5036_OUT16_CLR 0x24 > +#define LP5036_OUT17_CLR 0x25 > +#define LP5036_OUT18_CLR 0x26 > +#define LP5036_OUT19_CLR 0x27 > +#define LP5036_OUT20_CLR 0x28 > +#define LP5036_OUT21_CLR 0x29 > +#define LP5036_OUT22_CLR 0x2a > +#define LP5036_OUT23_CLR 0x2b > +#define LP5036_OUT24_CLR 0x2c > +#define LP5036_OUT25_CLR 0x2d > +#define LP5036_OUT26_CLR 0x2e > +#define LP5036_OUT27_CLR 0x2f > +#define LP5036_OUT28_CLR 0x30 > +#define LP5036_OUT29_CLR 0x31 > +#define LP5036_OUT30_CLR 0x32 > +#define LP5036_OUT31_CLR 0x33 > +#define LP5036_OUT32_CLR 0x34 > +#define LP5036_OUT33_CLR 0x35 > +#define LP5036_OUT34_CLR 0x36 > +#define LP5036_OUT35_CLR 0x37 > +#define LP5036_RESET 0x38 > + > +#define LP50XX_SW_RESET 0xff > +#define LP50XX_CHIP_EN BIT(6) > + > +/* There are 3 LED outputs per bank */ > +#define LP50XX_LEDS_PER_MODULE 3 > + > +#define LP5009_MAX_LED_MODULES 2 > +#define LP5012_MAX_LED_MODULES 4 > +#define LP5018_MAX_LED_MODULES 6 > +#define LP5024_MAX_LED_MODULES 8 > +#define LP5030_MAX_LED_MODULES 10 > +#define LP5036_MAX_LED_MODULES 12 > + > +#define LP5009_MAX_LEDS (LP5009_MAX_LED_MODULES * LP50XX_LEDS_PER_MODULE) > +#define LP5012_MAX_LEDS (LP5012_MAX_LED_MODULES * LP50XX_LEDS_PER_MODULE) > +#define LP5018_MAX_LEDS (LP5018_MAX_LED_MODULES * LP50XX_LEDS_PER_MODULE) > +#define LP5024_MAX_LEDS (LP5024_MAX_LED_MODULES * LP50XX_LEDS_PER_MODULE) > +#define LP5030_MAX_LEDS (LP5030_MAX_LED_MODULES * LP50XX_LEDS_PER_MODULE) > +#define LP5036_MAX_LEDS (LP5036_MAX_LED_MODULES * LP50XX_LEDS_PER_MODULE) > + > +static const struct reg_default lp5012_reg_defs[] = { > + {LP50XX_DEV_CFG0, 0x0}, > + {LP50XX_DEV_CFG1, 0x3c}, > + {LP50XX_LED_CFG0, 0x0}, > + {LP5012_BNK_BRT, 0xff}, > + {LP5012_BNKA_CLR, 0x0f}, > + {LP5012_BNKB_CLR, 0x0f}, > + {LP5012_BNKC_CLR, 0x0f}, > + {LP5012_LED0_BRT, 0x0f}, > + {LP5012_LED1_BRT, 0xff}, > + {LP5012_LED2_BRT, 0xff}, > + {LP5012_LED3_BRT, 0xff}, > + {LP5012_OUT0_CLR, 0x0f}, > + {LP5012_OUT1_CLR, 0x00}, > + {LP5012_OUT2_CLR, 0x00}, > + {LP5012_OUT3_CLR, 0x00}, > + {LP5012_OUT4_CLR, 0x00}, > + {LP5012_OUT5_CLR, 0x00}, > + {LP5012_OUT6_CLR, 0x00}, > + {LP5012_OUT7_CLR, 0x00}, > + {LP5012_OUT8_CLR, 0x00}, > + {LP5012_OUT9_CLR, 0x00}, > + {LP5012_OUT10_CLR, 0x00}, > + {LP5012_OUT11_CLR, 0x00}, > + {LP5012_RESET, 0x00} > +}; > + > +static const struct reg_default lp5024_reg_defs[] = { > + {LP50XX_DEV_CFG0, 0x0}, > + {LP50XX_DEV_CFG1, 0x3c}, > + {LP50XX_LED_CFG0, 0x0}, > + {LP5024_BNK_BRT, 0xff}, > + {LP5024_BNKA_CLR, 0x0f}, > + {LP5024_BNKB_CLR, 0x0f}, > + {LP5024_BNKC_CLR, 0x0f}, > + {LP5024_LED0_BRT, 0x0f}, > + {LP5024_LED1_BRT, 0xff}, > + {LP5024_LED2_BRT, 0xff}, > + {LP5024_LED3_BRT, 0xff}, > + {LP5024_LED4_BRT, 0xff}, > + {LP5024_LED5_BRT, 0xff}, > + {LP5024_LED6_BRT, 0xff}, > + {LP5024_LED7_BRT, 0xff}, > + {LP5024_OUT0_CLR, 0x0f}, > + {LP5024_OUT1_CLR, 0x00}, > + {LP5024_OUT2_CLR, 0x00}, > + {LP5024_OUT3_CLR, 0x00}, > + {LP5024_OUT4_CLR, 0x00}, > + {LP5024_OUT5_CLR, 0x00}, > + {LP5024_OUT6_CLR, 0x00}, > + {LP5024_OUT7_CLR, 0x00}, > + {LP5024_OUT8_CLR, 0x00}, > + {LP5024_OUT9_CLR, 0x00}, > + {LP5024_OUT10_CLR, 0x00}, > + {LP5024_OUT11_CLR, 0x00}, > + {LP5024_OUT12_CLR, 0x00}, > + {LP5024_OUT13_CLR, 0x00}, > + {LP5024_OUT14_CLR, 0x00}, > + {LP5024_OUT15_CLR, 0x00}, > + {LP5024_OUT16_CLR, 0x00}, > + {LP5024_OUT17_CLR, 0x00}, > + {LP5024_OUT18_CLR, 0x00}, > + {LP5024_OUT19_CLR, 0x00}, > + {LP5024_OUT20_CLR, 0x00}, > + {LP5024_OUT21_CLR, 0x00}, > + {LP5024_OUT22_CLR, 0x00}, > + {LP5024_OUT23_CLR, 0x00}, > + {LP5024_RESET, 0x00} > +}; > + > +static const struct reg_default lp5036_reg_defs[] = { > + {LP50XX_DEV_CFG0, 0x0}, > + {LP50XX_DEV_CFG1, 0x3c}, > + {LP50XX_LED_CFG0, 0x0}, > + {LP5036_LED_CFG1, 0x0}, > + {LP5036_BNK_BRT, 0xff}, > + {LP5036_BNKA_CLR, 0x0f}, > + {LP5036_BNKB_CLR, 0x0f}, > + {LP5036_BNKC_CLR, 0x0f}, > + {LP5036_LED0_BRT, 0x0f}, > + {LP5036_LED1_BRT, 0xff}, > + {LP5036_LED2_BRT, 0xff}, > + {LP5036_LED3_BRT, 0xff}, > + {LP5036_LED4_BRT, 0xff}, > + {LP5036_LED5_BRT, 0xff}, > + {LP5036_LED6_BRT, 0xff}, > + {LP5036_LED7_BRT, 0xff}, > + {LP5036_OUT0_CLR, 0x0f}, > + {LP5036_OUT1_CLR, 0x00}, > + {LP5036_OUT2_CLR, 0x00}, > + {LP5036_OUT3_CLR, 0x00}, > + {LP5036_OUT4_CLR, 0x00}, > + {LP5036_OUT5_CLR, 0x00}, > + {LP5036_OUT6_CLR, 0x00}, > + {LP5036_OUT7_CLR, 0x00}, > + {LP5036_OUT8_CLR, 0x00}, > + {LP5036_OUT9_CLR, 0x00}, > + {LP5036_OUT10_CLR, 0x00}, > + {LP5036_OUT11_CLR, 0x00}, > + {LP5036_OUT12_CLR, 0x00}, > + {LP5036_OUT13_CLR, 0x00}, > + {LP5036_OUT14_CLR, 0x00}, > + {LP5036_OUT15_CLR, 0x00}, > + {LP5036_OUT16_CLR, 0x00}, > + {LP5036_OUT17_CLR, 0x00}, > + {LP5036_OUT18_CLR, 0x00}, > + {LP5036_OUT19_CLR, 0x00}, > + {LP5036_OUT20_CLR, 0x00}, > + {LP5036_OUT21_CLR, 0x00}, > + {LP5036_OUT22_CLR, 0x00}, > + {LP5036_OUT23_CLR, 0x00}, > + {LP5036_OUT24_CLR, 0x00}, > + {LP5036_OUT25_CLR, 0x00}, > + {LP5036_OUT26_CLR, 0x00}, > + {LP5036_OUT27_CLR, 0x00}, > + {LP5036_OUT28_CLR, 0x00}, > + {LP5036_OUT29_CLR, 0x00}, > + {LP5036_OUT30_CLR, 0x00}, > + {LP5036_OUT31_CLR, 0x00}, > + {LP5036_OUT32_CLR, 0x00}, > + {LP5036_OUT33_CLR, 0x00}, > + {LP5036_OUT34_CLR, 0x00}, > + {LP5036_OUT35_CLR, 0x00}, > + {LP5036_RESET, 0x00} > +}; > + > +static const struct regmap_config lp5012_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + > + .max_register = LP5012_RESET, > + .reg_defaults = lp5012_reg_defs, > + .num_reg_defaults = ARRAY_SIZE(lp5012_reg_defs), > + .cache_type = REGCACHE_RBTREE, > +}; > + > +static const struct regmap_config lp5024_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + > + .max_register = LP5024_RESET, > + .reg_defaults = lp5024_reg_defs, > + .num_reg_defaults = ARRAY_SIZE(lp5024_reg_defs), > + .cache_type = REGCACHE_RBTREE, > +}; > + > +static const struct regmap_config lp5036_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + > + .max_register = LP5036_RESET, > + .reg_defaults = lp5036_reg_defs, > + .num_reg_defaults = ARRAY_SIZE(lp5036_reg_defs), > + .cache_type = REGCACHE_RBTREE, > +}; > + > +enum lp50xx_model { > + LP5009, > + LP5012, > + LP5018, > + LP5024, > + LP5030, > + LP5036, > +}; > + > +/* > + * struct lp50xx_chip_info - > + * @num_leds: number of LED outputs available on the device > + * @led_brightness0_reg: first brightness register of the device > + * @mix_out0_reg: first color mix register of the device > + * @bank_brt_reg: bank brightness register > + * @bank_mix_reg: color mix register > + * @reset_reg: device reset register > + */ > +struct lp50xx_chip_info { > + const struct regmap_config *lp50xx_regmap_config; > + int model_id; > + u8 max_modules; > + u8 num_leds; > + u8 led_brightness0_reg; > + u8 mix_out0_reg; > + u8 bank_brt_reg; > + u8 bank_mix_reg; > + u8 reset_reg; > +}; > + > +static const struct lp50xx_chip_info lp50xx_chip_info_tbl[] = { > + [LP5009] = { > + .model_id = LP5009, > + .max_modules = LP5009_MAX_LED_MODULES, > + .num_leds = LP5009_MAX_LEDS, > + .led_brightness0_reg = LP5012_LED0_BRT, > + .mix_out0_reg = LP5012_OUT0_CLR, > + .bank_brt_reg = LP5012_BNK_BRT, > + .bank_mix_reg = LP5012_BNKA_CLR, > + .reset_reg = LP5012_RESET, > + .lp50xx_regmap_config = &lp5012_regmap_config, > + }, > + [LP5012] = { > + .model_id = LP5012, > + .max_modules = LP5012_MAX_LED_MODULES, > + .num_leds = LP5012_MAX_LEDS, > + .led_brightness0_reg = LP5012_LED0_BRT, > + .mix_out0_reg = LP5012_OUT0_CLR, > + .bank_brt_reg = LP5012_BNK_BRT, > + .bank_mix_reg = LP5012_BNKA_CLR, > + .reset_reg = LP5012_RESET, > + .lp50xx_regmap_config = &lp5012_regmap_config, > + }, > + [LP5018] = { > + .model_id = LP5018, > + .max_modules = LP5018_MAX_LED_MODULES, > + .num_leds = LP5018_MAX_LEDS, > + .led_brightness0_reg = LP5024_LED0_BRT, > + .mix_out0_reg = LP5024_OUT0_CLR, > + .bank_brt_reg = LP5024_BNK_BRT, > + .bank_mix_reg = LP5024_BNKA_CLR, > + .reset_reg = LP5024_RESET, > + .lp50xx_regmap_config = &lp5024_regmap_config, > + }, > + [LP5024] = { > + .model_id = LP5024, > + .max_modules = LP5024_MAX_LED_MODULES, > + .num_leds = LP5024_MAX_LEDS, > + .led_brightness0_reg = LP5024_LED0_BRT, > + .mix_out0_reg = LP5024_OUT0_CLR, > + .bank_brt_reg = LP5024_BNK_BRT, > + .bank_mix_reg = LP5024_BNKA_CLR, > + .reset_reg = LP5024_RESET, > + .lp50xx_regmap_config = &lp5024_regmap_config, > + }, > + [LP5030] = { > + .model_id = LP5030, > + .max_modules = LP5030_MAX_LED_MODULES, > + .num_leds = LP5030_MAX_LEDS, > + .led_brightness0_reg = LP5036_LED0_BRT, > + .mix_out0_reg = LP5036_OUT0_CLR, > + .bank_brt_reg = LP5036_BNK_BRT, > + .bank_mix_reg = LP5036_BNKA_CLR, > + .reset_reg = LP5036_RESET, > + .lp50xx_regmap_config = &lp5036_regmap_config, > + }, > + [LP5036] = { > + .model_id = LP5036, > + .max_modules = LP5036_MAX_LED_MODULES, > + .num_leds = LP5036_MAX_LEDS, > + .led_brightness0_reg = LP5036_LED0_BRT, > + .mix_out0_reg = LP5036_OUT0_CLR, > + .bank_brt_reg = LP5036_BNK_BRT, > + .bank_mix_reg = LP5036_BNKA_CLR, > + .reset_reg = LP5036_RESET, > + .lp50xx_regmap_config = &lp5036_regmap_config, > + }, > +}; > + > +struct lp50xx_led { > + struct led_classdev led_dev; > + struct led_classdev_mc mc_cdev; > + struct lp50xx *priv; > + unsigned long bank_modules; > + int led_intensity[LP50XX_LEDS_PER_MODULE]; > + u8 ctrl_bank_enabled; > + int led_number; > +}; > + > +/** > + * struct lp50xx - > + * @enable_gpio: hardware enable gpio > + * @regulator: LED supply regulator pointer > + * @client: pointer to the I2C client > + * @regmap: device register map > + * @dev: pointer to the devices device struct > + * @lock: lock for reading/writing the device > + * @chip_info: chip specific information (ie num_leds) > + * @num_of_banked_leds: holds the number of banked LEDs > + * @leds: array of LED strings > + */ > +struct lp50xx { > + struct gpio_desc *enable_gpio; > + struct regulator *regulator; > + struct i2c_client *client; > + struct regmap *regmap; > + struct device *dev; > + struct mutex lock; > + const struct lp50xx_chip_info *chip_info; > + int num_of_banked_leds; > + > + /* This needs to be at the end of the struct */ > + struct lp50xx_led leds[]; > +}; > + > +static struct lp50xx_led *mcled_cdev_to_led(struct led_classdev_mc *mc_cdev) > +{ > + return container_of(mc_cdev, struct lp50xx_led, mc_cdev); > +} > + > +static int lp50xx_brightness_set(struct led_classdev *cdev, > + enum led_brightness brightness) > +{ > + struct led_classdev_mc *mc_dev = lcdev_to_mccdev(cdev); > + struct lp50xx_led *led = mcled_cdev_to_led(mc_dev); > + const struct lp50xx_chip_info *led_chip = led->priv->chip_info; > + u8 led_offset, reg_val; > + int ret = 0; > + int i; > + > + mutex_lock(&led->priv->lock); > + if (led->ctrl_bank_enabled) > + reg_val = led_chip->bank_brt_reg; > + else > + reg_val = led_chip->led_brightness0_reg + > + led->led_number; > + > + ret = regmap_write(led->priv->regmap, reg_val, brightness); > + if (ret) { > + dev_err(&led->priv->client->dev, > + "Cannot write brightness value %d\n", ret); > + goto out; > + } > + > + for (i = 0; i < led->mc_cdev.num_colors; i++) { > + if (led->ctrl_bank_enabled) { > + reg_val = led_chip->bank_mix_reg + i; > + } else { > + led_offset = (led->led_number * 3) + i; > + reg_val = led_chip->mix_out0_reg + led_offset; > + } > + > + ret = regmap_write(led->priv->regmap, reg_val, > + mc_dev->subled_info[i].intensity); > + if (ret) { > + dev_err(&led->priv->client->dev, > + "Cannot write intensity value %d\n", ret); > + goto out; > + } > + } > +out: > + mutex_unlock(&led->priv->lock); > + return ret; > +} > + > +static int lp50xx_set_banks(struct lp50xx *priv, u32 led_banks[]) > +{ > + u8 led_config_lo, led_config_hi; > + u32 bank_enable_mask = 0; > + int ret; > + int i; > + > + for (i = 0; i < priv->chip_info->max_modules; i++) { > + if (led_banks[i]) > + bank_enable_mask |= (1 << led_banks[i]); > + } > + > + led_config_lo = (u8)(bank_enable_mask & 0xff); > + led_config_hi = (u8)(bank_enable_mask >> 8) & 0xff; > + > + ret = regmap_write(priv->regmap, LP50XX_LED_CFG0, led_config_lo); > + if (ret) > + return ret; > + > + if (priv->chip_info->model_id >= LP5030) > + ret = regmap_write(priv->regmap, LP5036_LED_CFG1, > + led_config_hi); > + > + return ret; > +} > + > +static int lp50xx_reset(struct lp50xx *priv) > +{ > + if (priv->enable_gpio) > + return gpiod_direction_output(priv->enable_gpio, 1); > + else > + return regmap_write(priv->regmap, priv->chip_info->reset_reg, > + LP50XX_SW_RESET); > +} > + > +static int lp50xx_enable_disable(struct lp50xx *priv, u8 enable_disable) > +{ > + return regmap_write(priv->regmap, LP50XX_DEV_CFG0, enable_disable); > +} > + > +static int lp50xx_probe_dt(struct lp50xx *priv) > +{ > + u32 led_banks[LP5036_MAX_LED_MODULES] = {0}; > + struct fwnode_handle *child = NULL; > + struct fwnode_handle *led_node = NULL; > + struct led_init_data init_data = {}; > + struct led_classdev *led_cdev; > + struct mc_subled *mc_led_info; > + struct lp50xx_led *led; > + int num_colors; > + u32 color_id; > + int led_number; > + size_t i = 0; > + int ret = -EINVAL; > + > + priv->enable_gpio = devm_gpiod_get_optional(priv->dev, > + "enable", GPIOD_OUT_LOW); > + if (IS_ERR(priv->enable_gpio)) { > + ret = PTR_ERR(priv->enable_gpio); > + dev_err(&priv->client->dev, "Failed to get enable gpio: %d\n", > + ret); > + return ret; > + } > + > + priv->regulator = devm_regulator_get(priv->dev, "vled"); > + if (IS_ERR(priv->regulator)) > + priv->regulator = NULL; > + > + device_for_each_child_node(priv->dev, child) { > + led = &priv->leds[i]; > + ret = fwnode_property_count_u32(child, "reg"); > + if (ret < 0) { > + dev_err(&priv->client->dev, > + "reg property is invalid\n"); > + return -EINVAL; > + } > + if (ret > 1) { > + priv->num_of_banked_leds = ret; > + if (priv->num_of_banked_leds > > + priv->chip_info->max_modules) { > + dev_err(&priv->client->dev, > + "reg property is invalid\n"); > + ret = -EINVAL; > + fwnode_handle_put(child); > + goto child_out; > + } > + > + ret = fwnode_property_read_u32_array(child, > + "reg", > + led_banks, > + ret); > + if (ret) { > + dev_err(&priv->client->dev, > + "reg property is missing\n"); > + fwnode_handle_put(child); > + goto child_out; > + } > + > + ret = lp50xx_set_banks(priv, led_banks); > + if (ret) { > + dev_err(&priv->client->dev, > + "Cannot setup banked LEDs\n"); > + fwnode_handle_put(child); > + goto child_out; > + } > + led->ctrl_bank_enabled = 1; > + > + } else { > + ret = fwnode_property_read_u32(child, "reg", > + &led_number); > + if (ret) { > + dev_err(&priv->client->dev, > + "led reg property missing\n"); > + fwnode_handle_put(child); > + goto child_out; > + } > + > + if (led_number > priv->chip_info->num_leds) { > + dev_err(&priv->client->dev, > + "led-sources property is invalid\n"); > + ret = -EINVAL; > + fwnode_handle_put(child); > + goto child_out; > + } > + > + led->led_number = led_number; > + } > + > + init_data.fwnode = child; > + fwnode_property_read_string(child, "linux,default-trigger", > + &led->led_dev.default_trigger); The led_dev property of struct lp50xx_led is used only here and in the property definition. I don't think it is being read anywhere else. You need to save default trigger below, into led_cdev. And you can remove the led_dev property from struct lp50xx_led. Marek > + num_colors = 0; > + > + /* There are only 3 LEDs per module otherwise they should be > + * banked which also is presented as 3 LEDs > + */ > + mc_led_info = devm_kcalloc(priv->dev, LP50XX_LEDS_PER_MODULE, > + sizeof(*mc_led_info), GFP_KERNEL); > + if (!mc_led_info) > + return -ENOMEM; > + > + fwnode_for_each_child_node(child, led_node) { > + ret = fwnode_property_read_u32(led_node, "color", > + &color_id); > + if (ret) > + dev_err(priv->dev, "Cannot read color\n"); > + > + mc_led_info[num_colors].color_index = color_id; > + num_colors++; > + } > + > + led->priv = priv; > + led->mc_cdev.num_colors = num_colors; > + led->mc_cdev.subled_info = mc_led_info; > + led_cdev = &led->mc_cdev.led_cdev; > + led_cdev->brightness_set_blocking = lp50xx_brightness_set; > + ret = devm_led_classdev_multicolor_register_ext(&priv->client->dev, > + &led->mc_cdev, > + &init_data); > + if (ret) { > + dev_err(&priv->client->dev, "led register err: %d\n", > + ret); > + fwnode_handle_put(child); > + goto child_out; > + } > + i++; > + } > + > +child_out: > + return ret; > +} > + > +static int lp50xx_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct lp50xx *led; > + int count; > + int ret; > + > + count = device_get_child_node_count(&client->dev); > + if (!count) { > + dev_err(&client->dev, "LEDs are not defined in device tree!"); > + return -ENODEV; > + } > + > + led = devm_kzalloc(&client->dev, struct_size(led, leds, count), > + GFP_KERNEL); > + if (!led) > + return -ENOMEM; > + > + mutex_init(&led->lock); > + led->client = client; > + led->dev = &client->dev; > + led->chip_info = &lp50xx_chip_info_tbl[id->driver_data]; > + i2c_set_clientdata(client, led); > + led->regmap = devm_regmap_init_i2c(client, > + led->chip_info->lp50xx_regmap_config); > + if (IS_ERR(led->regmap)) { > + ret = PTR_ERR(led->regmap); > + dev_err(&client->dev, "Failed to allocate register map: %d\n", > + ret); > + return ret; > + } > + > + ret = lp50xx_reset(led); > + if (ret) > + return ret; > + > + ret = lp50xx_probe_dt(led); > + if (ret) > + return ret; > + > + return lp50xx_enable_disable(led, LP50XX_CHIP_EN); > +} > + > +static int lp50xx_remove(struct i2c_client *client) > +{ > + struct lp50xx *led = i2c_get_clientdata(client); > + int ret; > + > + ret = lp50xx_enable_disable(led, LP50XX_CHIP_EN); > + if (ret) { > + dev_err(&led->client->dev, "Failed to disable regulator\n"); > + return ret; > + } > + > + if (led->enable_gpio) > + gpiod_direction_output(led->enable_gpio, 0); > + > + if (led->regulator) { > + ret = regulator_disable(led->regulator); > + if (ret) > + dev_err(&led->client->dev, > + "Failed to disable regulator\n"); > + } > + > + mutex_destroy(&led->lock); > + > + return 0; > +} > + > +static const struct i2c_device_id lp50xx_id[] = { > + { "lp5009", LP5009 }, > + { "lp5012", LP5012 }, > + { "lp5018", LP5018 }, > + { "lp5024", LP5024 }, > + { "lp5030", LP5030 }, > + { "lp5036", LP5036 }, > + { } > +}; > +MODULE_DEVICE_TABLE(i2c, lp50xx_id); > + > +static const struct of_device_id of_lp50xx_leds_match[] = { > + { .compatible = "ti,lp5009", .data = (void *)LP5009 }, > + { .compatible = "ti,lp5012", .data = (void *)LP5012 }, > + { .compatible = "ti,lp5018", .data = (void *)LP5018 }, > + { .compatible = "ti,lp5024", .data = (void *)LP5024 }, > + { .compatible = "ti,lp5030", .data = (void *)LP5030 }, > + { .compatible = "ti,lp5036", .data = (void *)LP5036 }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, of_lp50xx_leds_match); > + > +static struct i2c_driver lp50xx_driver = { > + .driver = { > + .name = "lp50xx", > + .of_match_table = of_lp50xx_leds_match, > + }, > + .probe = lp50xx_probe, > + .remove = lp50xx_remove, > + .id_table = lp50xx_id, > +}; > +module_i2c_driver(lp50xx_driver); > + > +MODULE_DESCRIPTION("Texas Instruments LP50XX LED driver"); > +MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com>"); > +MODULE_LICENSE("GPL v2");
Hi! > > > This is the multi color LED framework. This framework presents clustered > > > colored LEDs into an array and allows the user space to adjust the brightness > > > of the cluster using a single file write. The individual colored LEDs > > > intensities are controlled via a single file that is an array of LEDs > > > > > > Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. > > > Added update to the u8500_defconfig > > > > Marek, would you be willing to look over this series? > > Overall this series looks good to me. I wanted to apply version 29 of > the patches, but I didn't receive all patches in v29 (some are > missing), so I had to search for previous versions of selected patches. > > I have seen some typos in documentation, but that can be solved > afterwards. > > One thing I don't like much is that in the sysfs multi_index and > multi_intensity files there is a trailing space after the last color. > This is not true for example for the trigger file. It is trivial to fix > this, so again maybe a will send a follow-up patch after this series is > accepted. Yes, I noticed that one, too, and expect it to be fixed before the merge. I believe you'll get next version of the patches... If not that one will likely appear in -next, so will be available using git. Thank you for the review, Pavel
Marek
Thanks for the review
On 7/12/20 12:21 PM, Marek Behun wrote:
> Hi Dan, one bug in this driver, see below.
This is not really a bug. It is an enhancement to the driver.
I will update it since I have to touch the series anyway.
Dan
Pavel Thanks for the review On 7/11/20 10:57 AM, Pavel Machek wrote: > Hi! > >> Introduce a multicolor class that groups colored LEDs >> within a LED node. >> +What: /sys/class/leds/<led>/multi_intensity >> +Date: March 2020 >> +KernelVersion: 5.8 >> +Contact: Dan Murphy <dmurphy@ti.com> >> +Description: read/write >> + Intensity level for the LED color within an array of integers. > ? "This file contains array of integers". OK > >> + The intensities for each color must be entered based on the >> + multi_index array. > This does not make sense to me. "Order of components is described by > the multi_index array"? > >> The max_intensity should not exceed > "max_intensity" -> "maximum intensity"? OK > >> + /sys/class/leds/<led>/max_brightness. >> +Multicolor Class Brightness Control >> +=================================== >> +The multicolor class framework will calculate each monochrome LEDs intensity. > ? This is redundant and will be removed. > >> +static ssize_t multi_intensity_store(struct device *dev, >> + struct device_attribute *intensity_attr, >> + const char *buf, size_t size) >> +{ >> + struct led_classdev *led_cdev = dev_get_drvdata(dev); >> + struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); >> + int nrchars, offset = 0; >> + int intensity_value[LED_COLOR_ID_MAX]; >> + int i; >> + ssize_t ret; >> + >> + mutex_lock(&led_cdev->led_access); >> + >> + for (i = 0; i < mcled_cdev->num_colors; i++) { >> + ret = sscanf(buf + offset, "%i%n", >> + &intensity_value[i], &nrchars); >> + if (ret != 1) { >> + dev_dbg(led_cdev->dev, >> + "Incorrect number of LEDs expected %i values intensity was not applied\n", >> + mcled_cdev->num_colors); >> + ret = -EINVAL; >> + goto err_out; >> + } >> + offset += nrchars; >> + } >> + >> + /* account for the space at the end of the buffer */ >> + offset++; > space? I'd expect \n there. And it would be good to verify it is > indeed \n, so that for example "0 0 0b" is not accepted. It is a new line the comment is incorrect I can remove the comment or update the comment to account for the new line > Please remove the dev_dbg()s that can be triggered by userspace. We > don't want users spamming the logs. Removed > >> +static ssize_t multi_intensity_show(struct device *dev, >> + struct device_attribute *intensity_attr, >> + char *buf) >> +{ >> + struct led_classdev *led_cdev = dev_get_drvdata(dev); >> + struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); >> + int len = 0; >> + int i; >> + >> + for (i = 0; i < mcled_cdev->num_colors; i++) { >> + len += sprintf(buf + len, "%d", >> + mcled_cdev->subled_info[i].intensity); >> + len += sprintf(buf + len, " "); > We should not really put " " before newline. OK I will fix that. >> +static ssize_t multi_index_show(struct device *dev, >> + struct device_attribute *multi_index_attr, >> + char *buf) >> +{ >> + for (i = 0; i < mcled_cdev->num_colors; i++) { >> + index = mcled_cdev->subled_info[i].color_index; >> + len += sprintf(buf + len, "%s", led_colors[index]); >> + len += sprintf(buf + len, " "); >> + } > We should not really put " " before newline. > >> +{ >> + struct led_classdev *led_cdev; >> + >> + if (!mcled_cdev) >> + return -EINVAL; >> + >> + if (!mcled_cdev->num_colors) >> + return -EINVAL; > It is plain int, so you may want to check for <= 0? Or maybe make it > unsigned? ok >> +MODULE_LICENSE("GPL v2"); > If your legal department allows that, GPL v2+ would be preffered > (globally). OK > >> +struct mc_subled { >> + int color_index; >> + int brightness; >> + int intensity; >> + int channel; >> +}; >> + >> +struct led_classdev_mc { >> + /* led class device */ >> + struct led_classdev led_cdev; >> + int num_colors; >> + >> + struct mc_subled *subled_info; >> +}; > Would some "unsigned"s make sense here to cut number of corner cases? I made these unsigned. Dan > > Best regards, > Pavel
Hello This is the multi color LED framework. This framework presents clustered colored LEDs into an array and allows the user space to adjust the brightness of the cluster using a single file write. The individual colored LEDs intensities are controlled via a single file that is an array of LEDs Change to the LEDs Kconfig to fix dependencies on the LP55XX_COMMON. Added update to the u8500_defconfig Dan Dan Murphy (16): dt: bindings: Add multicolor class dt bindings documention leds: Add multicolor ID to the color ID list leds: multicolor: Introduce a multicolor class definition dt: bindings: lp50xx: Introduce the lp50xx family of RGB drivers leds: lp50xx: Add the LP50XX family of the RGB LED driver dt-bindings: leds: Convert leds-lp55xx to yaml ARM: dts: n900: Add reg property to the LP5523 channel node ARM: dts: imx6dl-yapp4: Add reg property to the lp5562 channel node ARM: dts: ste-href: Add reg property to the LP5521 channel nodes leds: lp55xx: Convert LED class registration to devm_* leds: lp55xx: Add multicolor framework support to lp55xx ARM: defconfig: u8500: Add LP55XX_COMMON config flag leds: lp5523: Update the lp5523 code to add multicolor brightness function leds: lp5521: Add multicolor framework multicolor brightness support leds: lp55xx: Fix file permissions to use DEVICE_ATTR macros leds: lp5523: Fix various formatting issues in the code .../ABI/testing/sysfs-class-led-multicolor | 36 + .../bindings/leds/leds-class-multicolor.yaml | 37 + .../devicetree/bindings/leds/leds-lp50xx.yaml | 130 +++ .../devicetree/bindings/leds/leds-lp55xx.txt | 228 ----- .../devicetree/bindings/leds/leds-lp55xx.yaml | 220 +++++ Documentation/leds/index.rst | 1 + Documentation/leds/leds-class-multicolor.rst | 88 ++ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 14 +- arch/arm/boot/dts/omap3-n900.dts | 29 +- arch/arm/boot/dts/ste-href.dtsi | 22 +- arch/arm/configs/u8500_defconfig | 1 + drivers/leds/Kconfig | 32 +- drivers/leds/Makefile | 2 + drivers/leds/led-class-multicolor.c | 208 +++++ drivers/leds/led-core.c | 1 + drivers/leds/leds-lp50xx.c | 783 ++++++++++++++++++ drivers/leds/leds-lp5521.c | 43 +- drivers/leds/leds-lp5523.c | 62 +- drivers/leds/leds-lp5562.c | 22 +- drivers/leds/leds-lp55xx-common.c | 212 +++-- drivers/leds/leds-lp55xx-common.h | 16 +- drivers/leds/leds-lp8501.c | 23 +- include/dt-bindings/leds/common.h | 3 +- include/linux/led-class-multicolor.h | 121 +++ include/linux/platform_data/leds-lp55xx.h | 8 + 25 files changed, 1982 insertions(+), 360 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-led-multicolor create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.yaml delete mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.yaml create mode 100644 Documentation/leds/leds-class-multicolor.rst create mode 100644 drivers/leds/led-class-multicolor.c create mode 100644 drivers/leds/leds-lp50xx.c create mode 100644 include/linux/led-class-multicolor.h