Multicolor Framework v29
Subsystems (5)
v29 cover Multicolor Framework v29
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
Signature · 1 line
2.26.2
PATCH v29 1/16 dt: bindings: Add multicolor class dt bindings documention
Add DT bindings for the LEDs multicolor class framework. Add multicolor ID to the color ID list for device tree bindings.
--- .../bindings/leds/leds-class-multicolor.yaml | 37 +++++++++++++++++++ include/dt-bindings/leds/common.h | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml new file +37 -0
@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/leds-class-multicolor.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Common properties for the multicolor LED class. + +maintainers: + - Dan Murphy <[email protected]> + +description: | + Bindings for multi color LEDs show how to describe current outputs of + either integrated multi-color LED elements (like RGB, RGBW, RGBWA-UV + etc.) or standalone LEDs, to achieve logically grouped multi-color LED + modules. This is achieved by adding multi-led nodes layer to the + monochrome LED bindings. + The nodes and properties defined in this document are unique to the multicolor + LED class. Common LED nodes and properties are inherited from the common.txt + within this documentation directory. + +patternProperties: + "^multi-led@([0-9a-f])$": + type: object + description: Represents the LEDs that are to be grouped. + properties: + color: + const: 8 # LED_COLOR_ID_MULTI + description: | + For multicolor LED support this property should be defined as + LED_COLOR_ID_MULTI which can be found in include/linux/leds/common.h. + + $ref: "common.yaml#" + + required: + - color +...
include/dt-bindings/leds/common.h +2 -1
@@ -30,7 +30,8 @@#define LED_COLOR_ID_VIOLET 5#define LED_COLOR_ID_YELLOW 6#define LED_COLOR_ID_IR 7 -#define LED_COLOR_ID_MAX 8 +#define LED_COLOR_ID_MULTI 8 +#define LED_COLOR_ID_MAX 9/* Standard LED functions */ /* Keyboard LEDs, usually it would be input4::capslock etc. */
Signature · 1 line
2.26.2
Re: [PATCH v29 01/16] dt: bindings: Add multicolor class dt bindings documention
Hi!
Quoted 2 lines
Add DT bindings for the LEDs multicolor class framework. Add multicolor ID to the color ID list for device tree bindings.
Rob, can we get some reviews here? It would be good to move this forward.
Best regards,
Pavel
Quoted 68 lines
CC Rob Herring <[email protected]>Acked-by Pavel Machek <[email protected]>Acked-by Jacek Anaszewski <[email protected]>Signed-off-by Dan Murphy <[email protected]>--- .../bindings/leds/leds-class-multicolor.yaml | 37 +++++++++++++++++++ include/dt-bindings/leds/common.h | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yamlDocumentation/devicetree/bindings/leds/leds-class-multicolor.yaml new file +37
-0@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/leds-class-multicolor.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Common properties for the multicolor LED class. + +maintainers: + - Dan Murphy <[email protected]> + +description: | + Bindings for multi color LEDs show how to describe current outputs of + either integrated multi-color LED elements (like RGB, RGBW, RGBWA-UV + etc.) or standalone LEDs, to achieve logically grouped multi-color LED + modules. This is achieved by adding multi-led nodes layer to the + monochrome LED bindings. + The nodes and properties defined in this document are unique to the multicolor + LED class. Common LED nodes and properties are inherited from the common.txt + within this documentation directory. + +patternProperties: + "^multi-led@([0-9a-f])$": + type: object + description: Represents the LEDs that are to be grouped. + properties: + color: + const: 8 # LED_COLOR_ID_MULTI + description: | + For multicolor LED support this property should be defined as + LED_COLOR_ID_MULTI which can be found in include/linux/leds/common.h. + + $ref: "common.yaml#" + + required: + - color +...include/dt-bindings/leds/common.h +2
-2@@ -30,7 +30,8 @@#define LED_COLOR_ID_VIOLET 5#define LED_COLOR_ID_YELLOW 6#define LED_COLOR_ID_IR 7 -#define LED_COLOR_ID_MAX 8 +#define LED_COLOR_ID_MULTI 8 +#define LED_COLOR_ID_MAX 9/* Standard LED functions */ /* Keyboard LEDs, usually it would be input4::capslock etc. */ --
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v29 01/16] dt: bindings: Add multicolor class dt bindings documention
In reply to Dan MurphyQuoted 7 lines · Dan Murphy
Add DT bindings for the LEDs multicolor class framework. Add multicolor ID to the color ID list for device tree bindings.
CC Rob Herring <[email protected]>Acked-by Pavel Machek <[email protected]>Acked-by Jacek Anaszewski <[email protected]>Signed-off-by Dan Murphy <[email protected]>
Quoted 6 lines
--- .../bindings/leds/leds-class-multicolor.yaml | 37 +++++++++++++++++++ include/dt-bindings/leds/common.h | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
Re: [PATCH v29 01/16] dt: bindings: Add multicolor class dt bindings documention
Quoted 15 lines · Rob Herring
Quoted 7 lines · Dan Murphy
Add DT bindings for the LEDs multicolor class framework. Add multicolor ID to the color ID list for device tree bindings.
CC Rob Herring <[email protected]>Acked-by Pavel Machek <[email protected]>Acked-by Jacek Anaszewski <[email protected]>Signed-off-by Dan Murphy <[email protected]>Quoted 6 lines
--- .../bindings/leds/leds-class-multicolor.yaml | 37 +++++++++++++++++++ include/dt-bindings/leds/common.h | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
Quoted 1 line
Reviewed-by Rob Herring <[email protected]>
Thank you for the review!
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v29 2/16 leds: Add multicolor ID to the color ID list
In reply to Dan MurphyAdd a new color ID that is declared as MULTICOLOR as with the multicolor framework declaring a definitive color is not accurate as the node can contain multiple colors.
--- drivers/leds/led-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/leds/led-core.c +1 -0
@@ -34,6 +34,7 @@ const char * const led_colors[LED_COLOR_ID_MAX] = { [LED_COLOR_ID_VIOLET] = "violet", [LED_COLOR_ID_YELLOW] = "yellow", [LED_COLOR_ID_IR] = "ir", + [LED_COLOR_ID_MULTI ] ="multicolor" , };EXPORT_SYMBOL_GPL (led_colors);
Signature · 1 line
2.26.2
PATCH v29 3/16 leds: multicolor: Introduce a multicolor class definition
In reply to Dan MurphyIntroduce a multicolor class that groups colored LEDs within a LED node.
The multi color class groups monochrome LEDs and allows controlling two aspects of the final combined color: hue and lightness. The former is controlled via the intensity file and the latter is controlled via brightness file.
--- .../ABI/testing/sysfs-class-led-multicolor | 36 +++ Documentation/leds/index.rst | 1 + Documentation/leds/leds-class-multicolor.rst | 88 ++++++++ drivers/leds/Kconfig | 10 + drivers/leds/Makefile | 1 + drivers/leds/led-class-multicolor.c | 208 ++++++++++++++++++ include/linux/led-class-multicolor.h | 121 ++++++++++ 7 files changed, 465 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-led-multicolor create mode 100644 Documentation/leds/leds-class-multicolor.rst create mode 100644 drivers/leds/led-class-multicolor.c create mode 100644 include/linux/led-class-multicolor.h
Documentation/ABI/testing/sysfs-class-led-multicolor new file +36 -0
@@ -0,0 +1,36 @@ +What: /sys/class/leds/<led>/brightness +Date: March 2020 +KernelVersion: 5.8 +Contact: Dan Murphy <[email protected]> +Description: read/write + Writing to this file will update all LEDs within the group to a + calculated percentage of what each color LED intensity is set + to. The percentage is calculated for each grouped LED via the + equation below: + + led_brightness = brightness * multi_intensity/max_brightness + + For additional details please refer to + Documentation/leds/leds-class-multicolor.rst. + + The value of the LED is from 0 to + /sys/class/leds/<led>/max_brightness. + +What: /sys/class/leds/<led>/multi_index +Date: March 2020 +KernelVersion: 5.8 +Contact: Dan Murphy <[email protected]> +Description: read + The multi_index array, when read, will output the LED colors + as an array of strings as they are indexed in the + multi_intensity file. + +What: /sys/class/leds/<led>/multi_intensity +Date: March 2020 +KernelVersion: 5.8 +Contact: Dan Murphy <[email protected]> +Description: read/write + Intensity level for the LED color within an array of integers. + The intensities for each color must be entered based on the + multi_index array. The max_intensity should not exceed + /sys/class/leds/<led>/max_brightness.
Documentation/leds/index.rst +1 -0
@@ -9,6 +9,7 @@ LEDs leds-class leds-class-flash + leds-class-multicolor ledtrig-oneshot ledtrig-transient ledtrig-usbport
Documentation/leds/leds-class-multicolor.rst new file +88 -0
88 lines not on this page · raw message
drivers/leds/Kconfig +10 -0
@@ -30,6 +30,16 @@ config LEDS_CLASS_FLASH for the flash related features of a LED device. It can be built as a module. +config LEDS_CLASS_MULTI_COLOR + tristate "LED MultiColor Class Support" + depends on LEDS_CLASS + help + This option enables the multicolor LED sysfs class in /sys/class/leds. + It wraps LED class and adds multicolor LED specific sysfs attributes + and kernel internal API to it. You'll need this to provide support + for multicolor LEDs that are grouped together. This class is not + intended for single color LEDs. It can be built as a module. + config LEDS_BRIGHTNESS_HW_CHANGED bool "LED Class brightness_hw_changed attribute support" depends on LEDS_CLASS
drivers/leds/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_NEW_LEDS) += led-core.o obj-$(CONFIG_LEDS_CLASS) += led-class.o obj-$(CONFIG_LEDS_CLASS_FLASH) += led-class-flash.o +obj-$(CONFIG_LEDS_CLASS_MULTI_COLOR) += led-class-multicolor.o obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o # LED Platform Drivers (keep this sorted, M-| sort)
drivers/leds/led-class-multicolor.c new file +208 -0
208 lines not on this page · raw message
include/linux/led-class-multicolor.h new file +121 -0
121 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v29 03/16] leds: multicolor: Introduce a multicolor class definition
Hi!
Documentation/ABI/testing/sysfs-class-led-multicolor line 33
Quoted 9 lines
Introduce a multicolor class that groups colored LEDs within a LED node.
Documentation/ABI/testing/sysfs-class-led-multicolor new file +6
-0+What: /sys/class/leds/<led>/multi_intensity +Date: March 2020 +KernelVersion: 5.8 +Contact: Dan Murphy <[email protected]> +Description: read/write + Intensity level for the LED color within an array of integers.
? "This file contains array of integers".
Review
Quoted 2 lines
(quoted diff) +2
-0+ 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"?
Quoted 1 line
The
max_intensityshould not exceed
"max_intensity" -> "maximum intensity"?
Documentation/leds/leds-class-multicolor.rst line 42
Quoted 5 lines
Documentation/leds/leds-class-multicolor.rst new file +4
-0+ /sys/class/leds/<led>/max_brightness. +Multicolor Class Brightness Control +=================================== +The multicolor class framework will calculate each monochrome LEDs intensity.
?
Quoted 18 lines
drivers/leds/led-class-multicolor.c new file +18
-0+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,
drivers/leds/led-class-multicolor.c line 57
Quoted 10 lines
drivers/leds/led-class-multicolor.c new file +10
-0+"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.
drivers/leds/led-class-multicolor.c line 88
Quoted 13 lines
drivers/leds/led-class-multicolor.c new file +13
-0+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.
drivers/leds/led-class-multicolor.c line 110
Quoted 9 lines
drivers/leds/led-class-multicolor.c new file +9
-0+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.
drivers/leds/led-class-multicolor.c line 134
Quoted 8 lines
drivers/leds/led-class-multicolor.c new file +8
-0+{ +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?
Quoted 1 line
+MODULE_LICENSE("GPL v2");
If your legal department allows that, GPL v2+ would be preffered (globally).
Quoted 4 lines
include/linux/led-class-multicolor.h new file +4
-0+struct mc_subled { +int color_index; +int brightness; +int intensity;
include/linux/led-class-multicolor.h line 25
Quoted 10 lines
include/linux/led-class-multicolor.h new file +10
-0+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
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v29 03/16] leds: multicolor: Introduce a multicolor class definition
Pavel
Thanks for the review
Quoted 11 lines · Pavel Machek
Hi!
Documentation/ABI/testing/sysfs-class-led-multicolor line 33
Quoted 8 lines
Introduce a multicolor class that groups colored LEDs within a LED node.
Documentation/ABI/testing/sysfs-class-led-multicolor new file +6
-0+What: /sys/class/leds/<led>/multi_intensity +Date: March 2020 +KernelVersion: 5.8 +Contact: Dan Murphy <[email protected]> +Description: read/write + Intensity level for the LED color within an array of integers.? "This file contains array of integers".
OK
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ 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_indexarray"?Quoted 1 line
The
max_intensityshould not exceed"
max_intensity" -> "maximum intensity"?
OK
Quoted 6 lines
Documentation/leds/leds-class-multicolor.rst line 42
Quoted 5 lines
Documentation/leds/leds-class-multicolor.rst new file +4
-0+ /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.
Quoted 23 lines
Quoted 23 lines
drivers/leds/led-class-multicolor.c new file +22
-0+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;
Quoted 8 lines
drivers/leds/led-class-multicolor.c line 57
Quoted 6 lines
drivers/leds/led-class-multicolor.c new file +6
-0+ } + 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
Quoted 2 lines
Please remove the dev_dbg()s that can be triggered by userspace. We don't want users spamming the logs.
Removed
Quoted 15 lines
Quoted 4 lines
drivers/leds/led-class-multicolor.c new file +3
-0+static ssize_t multi_intensity_show (struct device *dev, +struct device_attribute *intensity_attr, +char *buf)drivers/leds/led-class-multicolor.c line 88
Quoted 10 lines
drivers/leds/led-class-multicolor.c new file +10
-0+{ +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.
Quoted 11 lines
drivers/leds/led-class-multicolor.c line 110
Quoted 9 lines
drivers/leds/led-class-multicolor.c new file +9
-0+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.
Quoted 10 lines
drivers/leds/led-class-multicolor.c line 134
Quoted 8 lines
drivers/leds/led-class-multicolor.c new file +8
-0+{ +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
Quoted 3 lines
Quoted 1 line
+MODULE_LICENSE("GPL v2");
If your legal department allows that, GPL v2+ would be preffered (globally).
OK
Quoted 16 lines
Quoted 5 lines
include/linux/led-class-multicolor.h new file +4
-0+struct mc_subled { +int color_index; +int brightness; +int intensity;include/linux/led-class-multicolor.h line 25
Quoted 10 lines
include/linux/led-class-multicolor.h new file +10
-0+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
Quoted 3 lines
Best regards,
Pavel
PATCH v29 4/16 dt: bindings: lp50xx: Introduce the lp50xx family of RGB drivers
In reply to Dan MurphyIntroduce the bindings for the Texas Instruments LP5036, LP5030, LP5024, LP5018, LP5012 and LP5009 RGB LED device driver. The LP5036/30/24/18/12/9 can control RGB LEDs individually or as part of a control bank group. These devices have the ability to adjust the mixing control for the RGB LEDs to obtain different colors independent of the overall brightness of the LED grouping.
Datasheet:
http://www.ti.com/lit/ds/symlink/lp5012.pdf
http://www.ti.com/lit/ds/symlink/lp5024.pdf
http://www.ti.com/lit/ds/symlink/lp5036.pdf
--- .../devicetree/bindings/leds/leds-lp50xx.yaml | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.yaml
Documentation/devicetree/bindings/leds/leds-lp50xx.yaml new file +130 -0
@@ -0,0 +1,130 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/leds-lp50xx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: LED driver for LP50XX RGB LED from Texas Instruments. + +maintainers: + - Dan Murphy <[email protected]> + +description: | + The LP50XX is multi-channel, I2C RGB LED Drivers that can group RGB LEDs into + a LED group or control them individually. + + The difference in these RGB LED drivers is the number of supported RGB + modules. + + For more product information please see the link below: + http://www.ti.com/lit/ds/symlink/lp5012.pdf + http://www.ti.com/lit/ds/symlink/lp5024.pdf + http://www.ti.com/lit/ds/symlink/lp5036.pdf + +properties: + compatible: + enum: + - ti,lp5009 + - ti,lp5012 + - ti,lp5018 + - ti,lp5024 + - ti,lp5030 + - ti,lp5036 + + reg: + maxItems: 1 + description: + I2C slave address + lp5009/12 - 0x14, 0x15, 0x16, 0x17 + lp5018/24 - 0x28, 0x29, 0x2a, 0x2b + lp5030/36 - 0x30, 0x31, 0x32, 0x33 + + enable-gpios: + maxItems: 1 + description: GPIO pin to enable/disable the device. + + vled-supply: + description: LED supply. + +patternProperties: + '^multi-led@[0-9a-f]$': + type: object + allOf: + - $ref: leds-class-multicolor.yaml# + properties: + reg: + minItems: 1 + maxItems: 12 + description: + This property denotes the LED module number(s) that is used on the + for the child node. The LED modules can either be used stand alone + or grouped into a module bank. + + patternProperties: + "(^led-[0-9a-f]$|led)": + type: object + $ref: common.yaml# + +required: + - compatible + - reg + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/leds/common.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + led-controller@14 { + compatible = "ti,lp5009"; + reg = <0x14>; + #address-cells = <1>; + #size-cells = <0>; + enable-gpios = <&gpio1 16>; + + multi-led@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1>; + color = <LED_COLOR_ID_MULTI>; + function = LED_FUNCTION_CHARGING; + + led-0 { + color = <LED_COLOR_ID_RED>; + }; + + led-1 { + color = <LED_COLOR_ID_GREEN>; + }; + + led-2 { + color = <LED_COLOR_ID_BLUE>; + }; + }; + + multi-led@2 { + #address-cells = <1>; + #size-cells = <2>; + reg = <0x2 0x3 0x5>; + color = <LED_COLOR_ID_MULTI>; + function = LED_FUNCTION_STANDBY; + + led-6 { + color = <LED_COLOR_ID_RED>; + }; + + led-7 { + color = <LED_COLOR_ID_GREEN>; + }; + + led-8 { + color = <LED_COLOR_ID_BLUE>; + }; + }; + }; + }; + +...
Signature · 1 line
2.26.2
Re: [PATCH v29 04/16] dt: bindings: lp50xx: Introduce the lp50xx family of RGB drivers
Quoted 12 lines · Dan Murphy
Introduce the bindings for the Texas Instruments LP5036, LP5030, LP5024, LP5018, LP5012 and LP5009 RGB LED device driver. The LP5036/30/24/18/12/9 can control RGB LEDs individually or as part of a control bank group. These devices have the ability to adjust the mixing control for the RGB LEDs to obtain different colors independent of the overall brightness of the LED grouping.
Datasheet:
http://www.ti.com/lit/ds/symlink/lp5012.pdf
http://www.ti.com/lit/ds/symlink/lp5024.pdf
http://www.ti.com/lit/ds/symlink/lp5036.pdf
Quoted 7 lines
Acked-by Jacek Anaszewski <[email protected]>Signed-off-by Dan Murphy <[email protected]>--- .../devicetree/bindings/leds/leds-lp50xx.yaml | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.yaml
PATCH v29 5/16 leds: lp50xx: Add the LP50XX family of the RGB LED driver
In reply to Dan MurphyIntroduce 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.
--- 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
drivers/leds/Kconfig +11 -0
@@ -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
drivers/leds/Makefile +1 -0
@@ -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
drivers/leds/leds-lp50xx.c new file +783 -0
783 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v29 05/16] leds: lp50xx: Add the LP50XX family of the RGB LED driver
Hi Dan, one bug in this driver, see below.
Quoted 691 lines · On Mon, 22 Jun 2020 13:59:08 -0500 Dan Murphy <[email protected]> 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 LEDsThe 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 <[email protected]>Signed-off-by Dan Murphy <[email protected]>--- 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.cdrivers/leds/Kconfig +11
-0@@ -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_LP8501drivers/leds/Makefile +1
-0@@ -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.odrivers/leds/leds-lp50xx.c new file +627
-0@@ -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 ;
drivers/leds/leds-lp50xx.c line 637
Quoted 10 lines
drivers/leds/leds-lp50xx.c new file +10
-0+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
Quoted 146 lines
drivers/leds/leds-lp50xx.c new file +146
-0+ 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 <[email protected]>" ); +MODULE_LICENSE ("GPL v2" );
Re: [PATCH v29 05/16] leds: lp50xx: Add the LP50XX family of the RGB LED driver
Marek
Thanks for the review
Quoted 1 line · Marek Behun
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
PATCH v29 6/16 dt-bindings: leds: Convert leds-lp55xx to yaml
In reply to Dan MurphyConvert the leds-lp55xx.txt to yaml binding.
--- .../devicetree/bindings/leds/leds-lp55xx.txt | 228 ------------------ .../devicetree/bindings/leds/leds-lp55xx.yaml | 220 +++++++++++++++++ 2 files changed, 220 insertions(+), 228 deletions(-) delete mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.yaml
Documentation/devicetree/bindings/leds/leds-lp55xx.txt deleted +0 -228
@@ -1,228 +0,0 @@ -Binding for TI/National Semiconductor LP55xx Led Drivers - -Required properties: -- compatible: one of - national,lp5521 - national,lp5523 - ti,lp55231 - ti,lp5562 - ti,lp8501 - -- reg: I2C slave address -- clock-mode: Input clock mode, (0: automode, 1: internal, 2: external) - -Each child has own specific current settings -- led-cur: Current setting at each led channel (mA x10, 0 if led is not connected) -- max-cur: Maximun current at each led channel. - -Optional properties: -- enable-gpio: GPIO attached to the chip's enable pin -- label: Used for naming LEDs -- pwr-sel: LP8501 specific property. Power selection for output channels. - 0: D1~9 are connected to VDD - 1: D1~6 with VDD, D7~9 with VOUT - 2: D1~6 with VOUT, D7~9 with VDD - 3: D1~9 are connected to VOUT - -Alternatively, each child can have a specific channel name and trigger: -- chan-name (optional): name of channel -- linux,default-trigger (optional): see - Documentation/devicetree/bindings/leds/common.txt - -example 1) LP5521 -3 LED channels, external clock used. Channel names are 'lp5521_pri:channel0', -'lp5521_pri:channel1' and 'lp5521_pri:channel2', with a heartbeat trigger -on channel 0. - -lp5521@32 { - compatible = "national,lp5521"; - reg = <0x32>; - label = "lp5521_pri"; - clock-mode = /bits/ 8 <2>; - - chan0 { - led-cur = /bits/ 8 <0x2f>; - max-cur = /bits/ 8 <0x5f>; - linux,default-trigger = "heartbeat"; - }; - - chan1 { - led-cur = /bits/ 8 <0x2f>; - max-cur = /bits/ 8 <0x5f>; - }; - - chan2 { - led-cur = /bits/ 8 <0x2f>; - max-cur = /bits/ 8 <0x5f>; - }; -}; - -example 2) LP5523 -9 LED channels with specific name. Internal clock used. -The I2C slave address is configurable with ASEL1 and ASEL0 pins. -Available addresses are 32/33/34/35h. - -ASEL1 ASEL0 Address -------------------------- - GND GND 32h - GND VEN 33h - VEN GND 34h - VEN VEN 35h - -lp5523@32 { - compatible = "national,lp5523"; - reg = <0x32>; - clock-mode = /bits/ 8 <1>; - - chan0 { - chan-name = "d1"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan1 { - chan-name = "d2"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan2 { - chan-name = "d3"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan3 { - chan-name = "d4"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan4 { - chan-name = "d5"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan5 { - chan-name = "d6"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan6 { - chan-name = "d7"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan7 { - chan-name = "d8"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan8 { - chan-name = "d9"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; -}; - -example 3) LP5562 -4 channels are defined. - -lp5562@30 { - compatible = "ti,lp5562"; - reg = <0x30>; - clock-mode = /bits/8 <2>; - - chan0 { - chan-name = "R"; - led-cur = /bits/ 8 <0x20>; - max-cur = /bits/ 8 <0x60>; - }; - - chan1 { - chan-name = "G"; - led-cur = /bits/ 8 <0x20>; - max-cur = /bits/ 8 <0x60>; - }; - - chan2 { - chan-name = "B"; - led-cur = /bits/ 8 <0x20>; - max-cur = /bits/ 8 <0x60>; - }; - - chan3 { - chan-name = "W"; - led-cur = /bits/ 8 <0x20>; - max-cur = /bits/ 8 <0x60>; - }; -}; - -example 4) LP8501 -9 channels are defined. The 'pwr-sel' is LP8501 specific property. -Others are same as LP5523. - -lp8501@32 { - compatible = "ti,lp8501"; - reg = <0x32>; - clock-mode = /bits/ 8 <2>; - pwr-sel = /bits/ 8 <3>; /* D1~9 connected to VOUT */ - - chan0 { - chan-name = "d1"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan1 { - chan-name = "d2"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan2 { - chan-name = "d3"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan3 { - chan-name = "d4"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan4 { - chan-name = "d5"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan5 { - chan-name = "d6"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan6 { - chan-name = "d7"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan7 { - chan-name = "d8"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; - - chan8 { - chan-name = "d9"; - led-cur = /bits/ 8 <0x14>; - max-cur = /bits/ 8 <0x20>; - }; -};
Documentation/devicetree/bindings/leds/leds-lp55xx.yaml new file +220 -0
220 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v29 06/16] dt-bindings: leds: Convert leds-lp55xx to yaml
Quoted 10 lines · Dan Murphy
Convert the leds-lp55xx.txt to yaml binding.
Signed-off-by Dan Murphy <[email protected]>--- .../devicetree/bindings/leds/leds-lp55xx.txt | 228 ------------------ .../devicetree/bindings/leds/leds-lp55xx.yaml | 220 +++++++++++++++++ 2 files changed, 220 insertions(+), 228 deletions(-) delete mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.yaml
PATCH v29 7/16 ARM: dts: n900: Add reg property to the LP5523 channel node
In reply to Dan MurphyAdd the reg property to each channel node. This update is to accommodate the multicolor framework. In addition to the accommodation this allows the LEDs to be placed on any channel and allow designs to skip channels as opposed to requiring sequential order.
--- arch/arm/boot/dts/omap3-n900.dts | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
arch/arm/boot/dts/omap3-n900.dts +20 -9
@@ -618,63 +618,74 @@ indicator { }; lp5523: lp5523@32 { + #address-cells = <1>; + #size-cells = <0>; compatible = "national,lp5523"; reg = <0x32>; clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */ enable-gpio = <&gpio2 9 GPIO_ACTIVE_HIGH>; /* 41 */ - chan0 { + chan@0 { chan-name = "lp5523:kb1"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <0>; }; - chan1 { + chan@1 { chan-name = "lp5523:kb2"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <1>; }; - chan2 { + chan@2 { chan-name = "lp5523:kb3"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <2>; }; - chan3 { + chan@3 { chan-name = "lp5523:kb4"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <3>; }; - chan4 { + chan@4 { chan-name = "lp5523:b"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <4>; }; - chan5 { + chan@5 { chan-name = "lp5523:g"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <5>; }; - chan6 { + chan@6 { chan-name = "lp5523:r"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <6>; }; - chan7 { + chan@7 { chan-name = "lp5523:kb5"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <7>; }; - chan8 { + chan@8 { chan-name = "lp5523:kb6"; led-cur = /bits/ 8 <50>; max-cur = /bits/ 8 <100>; + reg = <8>; }; };
Signature · 1 line
2.26.2
PATCH v29 8/16 ARM: dts: imx6dl-yapp4: Add reg property to the lp5562 channel node
In reply to Dan MurphyAdd the reg property to each channel node. This update is to accommodate the multicolor framework. In addition to the accommodation this allows the LEDs to be placed on any channel and allow designs to skip channels as opposed to requiring sequential order.
--- arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi +10 -4
@@ -258,29 +258,35 @@ leds: led-controller@30 { reg = <0x30>; clock-mode = /bits/ 8 <1>; status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; - chan0 { + chan@0 { chan-name = "R"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; + reg = <0>; }; - chan1 { + chan@1 { chan-name = "G"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; + reg = <1>; }; - chan2 { + chan@2 { chan-name = "B"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; + reg = <2>; }; - chan3 { + chan@3 { chan-name = "W"; led-cur = /bits/ 8 <0x0>; max-cur = /bits/ 8 <0x0>; + reg = <3>; }; };
Signature · 1 line
2.26.2
PATCH v29 9/16 ARM: dts: ste-href: Add reg property to the LP5521 channel nodes
In reply to Dan MurphyAdd the reg property to each channel node. This update is to accommodate the multicolor framework. In addition to the accommodation this allows the LEDs to be placed on any channel and allow designs to skip channels as opposed to requiring sequential order.
--- arch/arm/boot/dts/ste-href.dtsi | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
arch/arm/boot/dts/ste-href.dtsi +16 -6
@@ -58,16 +58,21 @@ lp5521@33 { reg = <0x33>; label = "lp5521_pri"; clock-mode = /bits/ 8 <2>; - chan0 { + #address-cells = <1>; + #size-cells = <0>; + chan@0 { + reg = <0>; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; linux,default-trigger = "heartbeat"; }; - chan1 { + chan@1 { + reg = <1>; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; }; - chan2 { + chan@2 { + reg = <2>; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; };
@@ -77,15 +82,20 @@ lp5521@34 { reg = <0x34>; label = "lp5521_sec"; clock-mode = /bits/ 8 <2>; - chan0 { + #address-cells = <1>; + #size-cells = <0>; + chan@0 { + reg = <0>; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; }; - chan1 { + chan@1 { + reg = <1>; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; }; - chan2 { + chan@2 { + reg = <2>; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; };
Signature · 1 line
2.26.2
PATCH v29 10/16 leds: lp55xx: Convert LED class registration to devm_*
In reply to Dan MurphyConvert the LED class registration calls to the LED devm_* registration calls.
--- drivers/leds/leds-lp5521.c | 9 +++------ drivers/leds/leds-lp5523.c | 9 +++------ drivers/leds/leds-lp5562.c | 9 +++------ drivers/leds/leds-lp55xx-common.c | 15 +-------------- drivers/leds/leds-lp55xx-common.h | 2 -- drivers/leds/leds-lp8501.c | 9 +++------ 6 files changed, 13 insertions(+), 40 deletions(-)
drivers/leds/leds-lp5521.c +3 -6
@@ -541,19 +541,17 @@ static int lp5521_probe(struct i2c_client *client, ret =lp55xx_register_leds (led, chip);if (ret) - goto err_register_leds; + goto err_out; ret =lp55xx_register_sysfs (chip);if (ret) {dev_err (&client->dev,"registering sysfs failed\n" ); - goto err_register_sysfs; + goto err_out; }return 0 ; -err_register_sysfs: -lp55xx_unregister_leds (led, chip); -err_register_leds: +err_out:lp55xx_deinit_device (chip); err_init:return ret;
@@ -566,7 +564,6 @@ static int lp5521_remove(struct i2c_client *client)lp5521_stop_all_engines (chip);lp55xx_unregister_sysfs (chip); -lp55xx_unregister_leds (led, chip);lp55xx_deinit_device (chip);return 0 ;
drivers/leds/leds-lp5523.c +3 -6
@@ -908,19 +908,17 @@ static int lp5523_probe(struct i2c_client *client, ret =lp55xx_register_leds (led, chip);if (ret) - goto err_register_leds; + goto err_out; ret =lp55xx_register_sysfs (chip);if (ret) {dev_err (&client->dev,"registering sysfs failed\n" ); - goto err_register_sysfs; + goto err_out; }return 0 ; -err_register_sysfs: -lp55xx_unregister_leds (led, chip); -err_register_leds: +err_out:lp55xx_deinit_device (chip); err_init:return ret;
@@ -933,7 +931,6 @@ static int lp5523_remove(struct i2c_client *client)lp5523_stop_all_engines (chip);lp55xx_unregister_sysfs (chip); -lp55xx_unregister_leds (led, chip);lp55xx_deinit_device (chip);return 0 ;
drivers/leds/leds-lp5562.c +3 -6
@@ -554,19 +554,17 @@ static int lp5562_probe(struct i2c_client *client, ret =lp55xx_register_leds (led, chip);if (ret) - goto err_register_leds; + goto err_out; ret =lp55xx_register_sysfs (chip);if (ret) {dev_err (&client->dev,"registering sysfs failed\n" ); - goto err_register_sysfs; + goto err_out; }return 0 ; -err_register_sysfs: -lp55xx_unregister_leds (led, chip); -err_register_leds: +err_out:lp55xx_deinit_device (chip); err_init:return ret;
@@ -580,7 +578,6 @@ static int lp5562_remove(struct i2c_client *client)lp5562_stop_engine (chip);lp55xx_unregister_sysfs (chip); -lp55xx_unregister_leds (led, chip);lp55xx_deinit_device (chip);return 0 ;
drivers/leds/leds-lp55xx-common.c +1 -14
@@ -181,7 +181,7 @@ static int lp55xx_init_led(struct lp55xx_led *led, led->cdev.name = name; } - ret =led_classdev_register (dev, &led->cdev); + ret =devm_led_classdev_register (dev, &led->cdev);if (ret) {dev_err (dev,"led register err: %d\n" , ret);return ret;
@@ -490,23 +490,10 @@ int lp55xx_register_leds(struct lp55xx_led *led, struct lp55xx_chip *chip)return 0 ; err_init_led: -lp55xx_unregister_leds (led, chip);return ret; }EXPORT_SYMBOL_GPL (lp55xx_register_leds); -void lp55xx_unregister_leds (struct lp55xx_led *led,struct lp55xx_chip *chip) -{ -int i; -struct lp55xx_led *each; - -for (i =0 ; i < chip->num_leds; i++) { - each = led + i; -led_classdev_unregister (&each->cdev); - } -} -EXPORT_SYMBOL_GPL (lp55xx_unregister_leds); -int lp55xx_register_sysfs (struct lp55xx_chip *chip) {struct device *dev = &chip->cl->dev;
drivers/leds/leds-lp55xx-common.h +0 -2
@@ -189,8 +189,6 @@ extern void lp55xx_deinit_device(struct lp55xx_chip *chip);/* common LED class device functions */ extern int lp55xx_register_leds (struct lp55xx_led *led,struct lp55xx_chip *chip); -extern void lp55xx_unregister_leds (struct lp55xx_led *led, -struct lp55xx_chip *chip);/* common device attributes functions */ extern int lp55xx_register_sysfs (struct lp55xx_chip *chip);
drivers/leds/leds-lp8501.c +3 -6
@@ -344,19 +344,17 @@ static int lp8501_probe(struct i2c_client *client, ret =lp55xx_register_leds (led, chip);if (ret) - goto err_register_leds; + goto err_out; ret =lp55xx_register_sysfs (chip);if (ret) {dev_err (&client->dev,"registering sysfs failed\n" ); - goto err_register_sysfs; + goto err_out; }return 0 ; -err_register_sysfs: -lp55xx_unregister_leds (led, chip); -err_register_leds: +err_out:lp55xx_deinit_device (chip); err_init:return ret;
@@ -369,7 +367,6 @@ static int lp8501_remove(struct i2c_client *client)lp8501_stop_engine (chip);lp55xx_unregister_sysfs (chip); -lp55xx_unregister_leds (led, chip);lp55xx_deinit_device (chip);return 0 ;
Signature · 1 line
2.26.2
PATCH v29 11/16 leds: lp55xx: Add multicolor framework support to lp55xx
In reply to Dan MurphyAdd multicolor framework support for the lp55xx family.
--- drivers/leds/Kconfig | 11 +- drivers/leds/leds-lp5521.c | 14 +- drivers/leds/leds-lp5523.c | 14 +- drivers/leds/leds-lp5562.c | 13 +- drivers/leds/leds-lp55xx-common.c | 177 +++++++++++++++++++--- drivers/leds/leds-lp55xx-common.h | 14 +- drivers/leds/leds-lp8501.c | 14 +- include/linux/platform_data/leds-lp55xx.h | 8 + 8 files changed, 213 insertions(+), 52 deletions(-)
drivers/leds/Kconfig +6 -5
@@ -397,7 +397,8 @@ config 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 + depends on LEDS_CLASS_MULTI_COLOR || !LEDS_CLASS_MULTI_COLOR + depends on OF select FW_LOADER select FW_LOADER_USER_HELPER help
@@ -407,7 +408,7 @@ config LEDS_LP55XX_COMMON config LEDS_LP5521 tristate "LED Support for N.S. LP5521 LED driver chip" depends on LEDS_CLASS && I2C - select LEDS_LP55XX_COMMON + depends on LEDS_LP55XX_COMMON help If you say yes here you get support for the National Semiconductor LP5521 LED driver. It is 3 channel chip with programmable engines.
@@ -417,7 +418,7 @@ config LEDS_LP5521 config LEDS_LP5523 tristate "LED Support for TI/National LP5523/55231 LED driver chip" depends on LEDS_CLASS && I2C - select LEDS_LP55XX_COMMON + depends on LEDS_LP55XX_COMMON help If you say yes here you get support for TI/National Semiconductor LP5523/55231 LED driver.
@@ -428,7 +429,7 @@ config LEDS_LP5523 config LEDS_LP5562 tristate "LED Support for TI LP5562 LED driver chip" depends on LEDS_CLASS && I2C - select LEDS_LP55XX_COMMON + depends on LEDS_LP55XX_COMMON help If you say yes here you get support for TI LP5562 LED driver. It is 4 channels chip with programmable engines.
@@ -438,7 +439,7 @@ config LEDS_LP5562 config LEDS_LP8501 tristate "LED Support for TI LP8501 LED driver chip" depends on LEDS_CLASS && I2C - select LEDS_LP55XX_COMMON + depends on LEDS_LP55XX_COMMON help If you say yes here you get support for TI LP8501 LED driver. It is 9 channel chip with programmable engines.
drivers/leds/leds-lp5521.c +8 -6
@@ -505,9 +505,16 @@ static int lp5521_probe(struct i2c_client *client,struct lp55xx_platform_data *pdata =dev_get_platdata (&client->dev);struct device_node *np = client->dev.of_node; + chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); +if (!chip) +return -ENOMEM ; + + chip->cfg = &lp5521_cfg; +if (!pdata) {if (np) { - pdata =lp55xx_of_populate_pdata (&client->dev, np); + pdata =lp55xx_of_populate_pdata (&client->dev, np, + chip);if (IS_ERR (pdata))return PTR_ERR (pdata); }else {
@@ -516,10 +523,6 @@ static int lp5521_probe(struct i2c_client *client, } } - chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); -if (!chip) -return -ENOMEM ; - led =devm_kcalloc (&client->dev, pdata->num_channels,sizeof (*led),GFP_KERNEL );if (!led)
@@ -527,7 +530,6 @@ static int lp5521_probe(struct i2c_client *client, chip->cl = client; chip->pdata = pdata; - chip->cfg = &lp5521_cfg;mutex_init (&chip->lock);
drivers/leds/leds-lp5523.c +8 -6
@@ -872,9 +872,16 @@ static int lp5523_probe(struct i2c_client *client,struct lp55xx_platform_data *pdata =dev_get_platdata (&client->dev);struct device_node *np = client->dev.of_node; + chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); +if (!chip) +return -ENOMEM ; + + chip->cfg = &lp5523_cfg; +if (!pdata) {if (np) { - pdata =lp55xx_of_populate_pdata (&client->dev, np); + pdata =lp55xx_of_populate_pdata (&client->dev, np, + chip);if (IS_ERR (pdata))return PTR_ERR (pdata); }else {
@@ -883,10 +890,6 @@ static int lp5523_probe(struct i2c_client *client, } } - chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); -if (!chip) -return -ENOMEM ; - led =devm_kcalloc (&client->dev, pdata->num_channels,sizeof (*led),GFP_KERNEL );if (!led)
@@ -894,7 +897,6 @@ static int lp5523_probe(struct i2c_client *client, chip->cl = client; chip->pdata = pdata; - chip->cfg = &lp5523_cfg;mutex_init (&chip->lock);
drivers/leds/leds-lp5562.c +8 -5
@@ -520,9 +520,16 @@ static int lp5562_probe(struct i2c_client *client,struct lp55xx_platform_data *pdata =dev_get_platdata (&client->dev);struct device_node *np = client->dev.of_node; + chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); +if (!chip) +return -ENOMEM ; + + chip->cfg = &lp5562_cfg; +if (!pdata) {if (np) { - pdata =lp55xx_of_populate_pdata (&client->dev, np); + pdata =lp55xx_of_populate_pdata (&client->dev, np, + chip);if (IS_ERR (pdata))return PTR_ERR (pdata); }else {
@@ -531,9 +538,6 @@ static int lp5562_probe(struct i2c_client *client, } } - chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); -if (!chip) -return -ENOMEM ; led =devm_kcalloc (&client->dev, pdata->num_channels,sizeof (*led),GFP_KERNEL );
@@ -542,7 +546,6 @@ static int lp5562_probe(struct i2c_client *client, chip->cl = client; chip->pdata = pdata; - chip->cfg = &lp5562_cfg;mutex_init (&chip->lock);
drivers/leds/leds-lp55xx-common.c +155 -22
234 lines not on this page · raw message
drivers/leds/leds-lp55xx-common.h +12 -2
@@ -12,6 +12,8 @@#ifndef _LEDS_LP55XX_COMMON_H#define _LEDS_LP55XX_COMMON_H +#include <linux/led-class-multicolor.h> +enum lp55xx_engine_index {LP55XX_ENGINE_INVALID , LP55XX_ENGINE_1,
@@ -93,6 +95,7 @@ struct lp55xx_reg {* @max_channel : Maximum number of channels * @post_init_device : Chip specific initialization code * @brightness_fn : Brightness function +* @multicolor_brightness_fn : Multicolor brightness function * @set_led_current : LED current set function * @firmware_cb : Call function when the firmware is loaded * @run_engine : Run internal engine for pattern
@@ -106,9 +109,12 @@ struct lp55xx_device_config {/* define if the device has specific initialization process */ int (*post_init_device) (struct lp55xx_chip *chip); -/* access brightness register */ +/* set LED brightness */ int (*brightness_fn)(struct lp55xx_led *led); +/* set multicolor LED brightness */ +int (*multicolor_brightness_fn)(struct lp55xx_led *led); +/* current setting function */ void (*set_led_current) (struct lp55xx_led *led,u8 led_current);
@@ -159,6 +165,8 @@ struct lp55xx_chip {* struct lp55xx_led * @chan_nr : Channel number * @cdev : LED class device +* @mc_cdev : Multi color class device +* @color_components: Multi color LED map information * @led_current : Current setting at each led channel * @max_current : Maximun current at each led channel * @brightness : Brightness value
@@ -167,6 +175,7 @@ struct lp55xx_chip {struct lp55xx_led {int chan_nr;struct led_classdev cdev; +struct led_classdev_mc mc_cdev;u8 led_current;u8 max_current;u8 brightness;
@@ -196,6 +205,7 @@ extern void lp55xx_unregister_sysfs(struct lp55xx_chip *chip);/* common device tree population function */ extern struct lp55xx_platform_data -*lp55xx_of_populate_pdata (struct device *dev,struct device_node *np); +*lp55xx_of_populate_pdata (struct device *dev,struct device_node *np, +struct lp55xx_chip *chip);#endif /* _LEDS_LP55XX_COMMON_H */
drivers/leds/leds-lp8501.c +8 -6
@@ -308,9 +308,16 @@ static int lp8501_probe(struct i2c_client *client,struct lp55xx_platform_data *pdata =dev_get_platdata (&client->dev);struct device_node *np = client->dev.of_node; + chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); +if (!chip) +return -ENOMEM ; + + chip->cfg = &lp8501_cfg; +if (!pdata) {if (np) { - pdata =lp55xx_of_populate_pdata (&client->dev, np); + pdata =lp55xx_of_populate_pdata (&client->dev, np, + chip);if (IS_ERR (pdata))return PTR_ERR (pdata); }else {
@@ -319,10 +326,6 @@ static int lp8501_probe(struct i2c_client *client, } } - chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL ); -if (!chip) -return -ENOMEM ; - led =devm_kcalloc (&client->dev, pdata->num_channels,sizeof (*led),GFP_KERNEL );if (!led)
@@ -330,7 +333,6 @@ static int lp8501_probe(struct i2c_client *client, chip->cl = client; chip->pdata = pdata; - chip->cfg = &lp8501_cfg;mutex_init (&chip->lock);
include/linux/platform_data/leds-lp55xx.h +8 -0
@@ -12,17 +12,25 @@#ifndef _LEDS_LP55XX_H#define _LEDS_LP55XX_H +#include <linux/led-class-multicolor.h> +/* Clock configuration */ #define LP55XX_CLOCK_AUTO 0#define LP55XX_CLOCK_INT 1#define LP55XX_CLOCK_EXT 2 +#define LP55XX_MAX_GROUPED_CHAN 4 +struct lp55xx_led_config {const char *name;const char *default_trigger;u8 chan_nr;u8 led_current;/* mA x10, 0 if led is not connected */ u8 max_current; +int num_colors; +unsigned int max_channel; +int color_id[LED_COLOR_ID_MAX ]; +int output_num[LED_COLOR_ID_MAX ]; }; struct lp55xx_predef_pattern {
Signature · 1 line
2.26.2
PATCH v29 12/16 ARM: defconfig: u8500: Add LP55XX_COMMON config flag
In reply to Dan MurphyThe 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.
--- arch/arm/configs/u8500_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/u8500_defconfig +1 -0
@@ -113,6 +113,7 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_LM3530=y CONFIG_LEDS_GPIO=y +CONFIG_LEDS_LP55XX_COMMON=y CONFIG_LEDS_LP5521=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_RTC_CLASS=y
Signature · 1 line
2.26.2
Re: [PATCH v29 12/16] ARM: defconfig: u8500: Add LP55XX_COMMON config flag
Quoted 7 lines · Dan Murphy
The dependencies for the LP55XX LED drivers have been updated so that the child devices (i.e. LP5521) now depends on the
LP55XX_COMMONconfig flag as opposed to the device selecting theLP55XX_COMMONflag. TheLP55XX_COMMONneeds to be set in the defconfig.CC Linus Walleij <[email protected]>Signed-off-by Dan Murphy <[email protected]>
...but I don't think I'm right person to apply this.
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v29 13/16 leds: lp5523: Update the lp5523 code to add multicolor brightness function
In reply to Dan MurphyAdd the multicolor brightness call back to support the multicolor framework. This call back allows setting brightness on grouped channels in a single function.
--- drivers/leds/leds-lp5523.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/leds/leds-lp5523.c +20 -0
@@ -791,6 +791,25 @@ static ssize_t store_master_fader_leds(struct device *dev,return ret; } +static int lp5523_multicolor_brightness (struct lp55xx_led *led) +{ +struct lp55xx_chip *chip = led->chip; +int ret; +int i; + +mutex_lock (&chip->lock); +for (i =0 ; i < led->mc_cdev.num_colors; i++) { + ret =lp55xx_write (chip, +LP5523_REG_LED_PWM_BASE + + led->mc_cdev.subled_info[i].channel, + led->mc_cdev.subled_info[i].brightness); +if (ret) +break ; + } +mutex_unlock (&chip->lock); +return ret; +} +static int lp5523_led_brightness (struct lp55xx_led *led) {struct lp55xx_chip *chip = led->chip;
@@ -857,6 +876,7 @@ static struct lp55xx_device_config lp5523_cfg = { .max_channel = LP5523_MAX_LEDS, .post_init_device = lp5523_post_init_device, .brightness_fn = lp5523_led_brightness, + .multicolor_brightness_fn = lp5523_multicolor_brightness, .set_led_current = lp5523_set_led_current, .firmware_cb = lp5523_firmware_loaded, .run_engine = lp5523_run_engine,
Signature · 1 line
2.26.2
Re: [PATCH v29 13/16] leds: lp5523: Update the lp5523 code to add multicolor brightness function
Hi!
Quoted 2 lines
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
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v29 13/16] leds: lp5523: Update the lp5523 code to add multicolor brightness function
Quoted 6 lines · Pavel Machek
Hi!
Quoted 2 lines
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".
Signature · 2 lines
Best regards, Jacek Anaszewski
Re: [PATCH v29 13/16] leds: lp5523: Update the lp5523 code to add multicolor brightness function
Quoted 9 lines · Jacek Anaszewski
Quoted 6 lines · Pavel Machek
Hi!
Quoted 2 lines
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.
We are using fixed width fonts, so typewriter rules still apply here.
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v29 13/16] leds: lp5523: Update the lp5523 code to add multicolor brightness function
Quoted 9 lines · Pavel Machek
Quoted 8 lines · Jacek Anaszewski
Quoted 6 lines · Pavel Machek
Hi!
Quoted 2 lines
Add the multicolor brightness call back to support the multicolor framework. This call back allows setting brightness on grouped channels
Extra space before "brightness".
Quoted 7 lines
Quoted 1 line
And before "This".
That one is intentional, I believe.
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
Signature · 2 lines
Best regards, Jacek Anaszewski
PATCH v29 14/16 leds: lp5521: Add multicolor framework multicolor brightness support
In reply to Dan MurphyAdd the multicolor brightness call back to support the multicolor framework. This function allows setting the brightness across grouped LED channels in a single call.
--- drivers/leds/leds-lp5521.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/leds/leds-lp5521.c +20 -0
@@ -349,6 +349,25 @@ static int lp5521_run_selftest(struct lp55xx_chip *chip, char *buf)return 0 ; } +static int lp5521_multicolor_brightness (struct lp55xx_led *led) +{ +struct lp55xx_chip *chip = led->chip; +int ret; +int i; + +mutex_lock (&chip->lock); +for (i =0 ; i < led->mc_cdev.num_colors; i++) { + ret =lp55xx_write (chip, +LP5521_REG_LED_PWM_BASE + + led->mc_cdev.subled_info[i].channel, + led->mc_cdev.subled_info[i].brightness); +if (ret) +break ; + } +mutex_unlock (&chip->lock); +return ret; +} +static int lp5521_led_brightness (struct lp55xx_led *led) {struct lp55xx_chip *chip = led->chip;
@@ -490,6 +509,7 @@ static struct lp55xx_device_config lp5521_cfg = { .max_channel = LP5521_MAX_LEDS, .post_init_device = lp5521_post_init_device, .brightness_fn = lp5521_led_brightness, + .multicolor_brightness_fn = lp5521_multicolor_brightness, .set_led_current = lp5521_set_led_current, .firmware_cb = lp5521_firmware_loaded, .run_engine = lp5521_run_engine,
Signature · 1 line
2.26.2
PATCH v29 15/16 leds: lp55xx: Fix file permissions to use DEVICE_ATTR macros
In reply to Dan MurphyFix the checkpatch warnings for the use of the file permission macros. In converting the file permissions to the DEVICE_ATTR_XX macros the call back function names needed to be updated within the code.
This means that the lp55xx_ needed to be dropped in the name to keep in harmony with the ABI documentation.
--- drivers/leds/leds-lp55xx-common.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/leds/leds-lp55xx-common.c +10 -12
@@ -83,7 +83,7 @@ static int lp55xx_post_init_device(struct lp55xx_chip *chip)return cfg->post_init_device (chip); } -static ssize_t lp55xx_show_current (struct device *dev, +static ssize_t led_current_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -92,7 +92,7 @@ static ssize_t lp55xx_show_current(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"%d\n" , led->led_current); } -static ssize_t lp55xx_store_current (struct device *dev, +static ssize_t led_current_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {
@@ -116,7 +116,7 @@ static ssize_t lp55xx_store_current(struct device *dev,return len; } -static ssize_t lp55xx_show_max_current (struct device *dev, +static ssize_t max_current_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -125,9 +125,8 @@ static ssize_t lp55xx_show_max_current(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"%d\n" , led->max_current); } -static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, lp55xx_show_current, - lp55xx_store_current); -static DEVICE_ATTR(max_current, S_IRUGO , lp55xx_show_max_current, NULL); +static DEVICE_ATTR_RW (led_current); +static DEVICE_ATTR_RO (max_current);static struct attribute *lp55xx_led_attrs[] = { &dev_attr_led_current.attr,
@@ -271,7 +270,7 @@ static int lp55xx_request_firmware(struct lp55xx_chip *chip) GFP_KERNEL, chip, lp55xx_firmware_loaded); } -static ssize_t lp55xx_show_engine_select (struct device *dev, +static ssize_t select_engine_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -281,7 +280,7 @@ static ssize_t lp55xx_show_engine_select(struct device *dev,return sprintf (buf,"%d\n" , chip->engine_idx); } -static ssize_t lp55xx_store_engine_select (struct device *dev, +static ssize_t select_engine_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {
@@ -323,7 +322,7 @@ static inline void lp55xx_run_engine(struct lp55xx_chip *chip, bool start) chip->cfg->run_engine (chip, start); } -static ssize_t lp55xx_store_engine_run (struct device *dev, +static ssize_t run_engine_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {
@@ -348,9 +347,8 @@ static ssize_t lp55xx_store_engine_run(struct device *dev,return len; } -static DEVICE_ATTR(select_engine, S_IRUGO | S_IWUSR, - lp55xx_show_engine_select, lp55xx_store_engine_select); -static DEVICE_ATTR(run_engine, S_IWUSR, NULL, lp55xx_store_engine_run); +static DEVICE_ATTR_RW (select_engine); +static DEVICE_ATTR_WO (run_engine);static struct attribute *lp55xx_engine_attributes[] = { &dev_attr_select_engine.attr,
Signature · 1 line
2.26.2
PATCH v29 16/16 leds: lp5523: Fix various formatting issues in the code
In reply to Dan MurphyFix checkpatch errors and warnings for the LP5523.c device driver.
--- drivers/leds/leds-lp5523.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/leds/leds-lp5523.c +10 -9
@@ -23,13 +23,13 @@#define LP5523_PROGRAM_LENGTH 32/* bytes */ /* Memory is used like this: -0x00 engine 1 program -0x10 engine 2 program -0x20 engine 3 program -0x30 engine 1 muxing info -0x40 engine 2 muxing info -0x50 engine 3 muxing info -*/ +* 0x00 engine 1 program +* 0x10 engine 2 program +* 0x20 engine 3 program +* 0x30 engine 1 muxing info +* 0x40 engine 2 muxing info +* 0x50 engine 3 muxing info +*/ #define LP5523_MAX_LEDS 9/* Registers */
@@ -326,7 +326,7 @@ static int lp5523_update_program_memory(struct lp55xx_chip *chip, const u8 *data, size_t size) {u8 pattern[LP5523_PROGRAM_LENGTH ] = {0 }; -unsigned cmd; +unsigned int cmd;char c[3 ];int nrchars;int ret;
@@ -468,6 +468,7 @@ static int lp5523_mux_parse(const char *buf, u16 *mux, size_t len)static void lp5523_mux_to_array (u16 led_mux,char *array) {int i, pos =0 ; +for (i =0 ; i <LP5523_MAX_LEDS ; i++) pos +=sprintf (array + pos,"%x" ,LED_ACTIVE (led_mux, i));
@@ -506,7 +507,7 @@ static int lp5523_load_mux(struct lp55xx_chip *chip, u16 mux, int nr)if (ret)return ret; - ret =lp55xx_write (chip,LP5523_REG_PROG_MEM , (u8)(mux >>8 )); + ret =lp55xx_write (chip,LP5523_REG_PROG_MEM , (u8)(mux >>8 ));if (ret)return ret;
Signature · 1 line
2.26.2
Hi!
Quoted 7 lines
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 LEDsChange to the LEDs
Kconfigto fix dependencies on theLP55XX_COMMON. Added update to theu8500_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
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Pavel
Quoted 15 lines · Pavel Machek
Hi!
Quoted 7 lines
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 LEDsChange to the LEDs
Kconfigto fix dependencies on theLP55XX_COMMON. Added update to theu8500_defconfigMarek, would you be willing to look over this series?
Dan, can we please get it in the order
1) fixes first
Quoted 8 lines
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
Quoted 22 lines · Dan Murphy
Pavel
Quoted 19 lines · Pavel Machek
Hi!
Quoted 7 lines
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
Kconfigto fix dependencies on theLP55XX_COMMON. Added update to theu8500_defconfigMarek, 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
Quoted 9 lines
Quoted 4 lines
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
Quoted 3 lines
Dan
Quoted 14 lines · Pavel Machek
Hi!
Quoted 7 lines
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 LEDsChange to the LEDs
Kconfigto fix dependencies on theLP55XX_COMMON. Added update to theu8500_defconfigMarek, would you be willing to look over this series?
Dan, can we please get it in the order
Quoted 7 lines
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
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 11 lines · On Sat, 4 Jul 2020 14:47:29 +0200 Pavel Machek <[email protected]> wrote:
Hi!
Quoted 7 lines
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 LEDsChange to the LEDs
Kconfigto fix dependencies on theLP55XX_COMMON. Added update to theu8500_defconfigMarek, 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
Quoted 16 lines
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!
Quoted 14 lines
Quoted 9 lines
Quoted 7 lines
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 LEDsChange to the LEDs
Kconfigto fix dependencies on theLP55XX_COMMON. Added update to theu8500_defconfigMarek, 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.
Quoted 8 lines
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_indexandmulti_intensityfiles 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
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html