Hello
For those I have added to this patchset this is a new LED framework that will
group monochrome LEDs into a directory under the parent LED class device. I have
CC'd you on this because you maintain a device tree file that contains one of
the devices affected by this change. Most notably the change is to add the
reg property to each LED child node to denote the output channel that the node
is to use. This not only is required for the Multicolor framework but also gives
flexibilty in DT design to be able to not be bound to sequential channel
numbering.
There are many changes from v8 to this patchset from Jacek's comments.
v8 series
https://lore.kernel.org/patchwork/project/lkml/list/?series=411331
Most notably
Removal of get/set_brightness ops
Dereferencing the monochrome LED intensity from the multicolor structure as
opposed to the ops.
Update for LP55xx DT properties to include the reg property to identify the
output channel for multicolor and non-multicolor use cases. This also allows
HW designers to skip output channels if they desire.
Updated the corresponding affect device tree files to add the reg property
Checkpatch error fixes for the lp55xx common
These changes were tested using the LP50xx evms and LP5523 EVM connected to a
BeagleBone black device.
Dan
Dan Murphy (15):
leds: multicolor: Add sysfs interface definition
dt: bindings: Add multicolor class dt bindings documention
dt-bindings: leds: Add multicolor ID to the color ID list
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: lp55xx: Be consistent in the document with LED
dt: bindings: lp55xx: Update binding for Multicolor Framework
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: Update the lp55xx to use the multi color framework
leds: lp55xx: Fix checkpatch file permissions issues
leds: lp5523: Fix checkpatch issues in the code
.../ABI/testing/sysfs-class-led-multicolor | 35 +
.../bindings/leds/leds-class-multicolor.txt | 98 +++
.../devicetree/bindings/leds/leds-lp50xx.txt | 148 ++++
.../devicetree/bindings/leds/leds-lp55xx.txt | 105 ++-
Documentation/leds/index.rst | 1 +
Documentation/leds/leds-class-multicolor.rst | 96 +++
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 6 +
arch/arm/boot/dts/omap3-n900.dts | 11 +
arch/arm/boot/dts/ste-href.dtsi | 10 +
drivers/leds/Kconfig | 22 +
drivers/leds/Makefile | 2 +
drivers/leds/led-class-multicolor.c | 220 +++++
drivers/leds/led-core.c | 1 +
drivers/leds/leds-lp50xx.c | 767 ++++++++++++++++++
drivers/leds/leds-lp5523.c | 32 +-
drivers/leds/leds-lp55xx-common.c | 172 +++-
drivers/leds/leds-lp55xx-common.h | 11 +
include/dt-bindings/leds/common.h | 3 +-
include/linux/led-class-multicolor.h | 74 ++
include/linux/platform_data/leds-lp55xx.h | 6 +
20 files changed, 1771 insertions(+), 49 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-led-multicolor
create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.txt
create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.txt
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
--
2.22.0.214.g8dca754b1e
Update the DT binding to include the properties to use the
multicolor framework for the devices that use the LP55xx
framework.
Signed-off-by: Dan Murphy <[email protected]>
CC: Tony Lindgren <[email protected]>
CC: "Benoît Cousson" <[email protected]>
CC: Linus Walleij <[email protected]>
CC: Shawn Guo <[email protected]>
CC: Sascha Hauer <[email protected]>
CC: Pengutronix Kernel Team <[email protected]>
CC: Fabio Estevam <[email protected]>
CC: NXP Linux Team <[email protected]>
---
.../devicetree/bindings/leds/leds-lp55xx.txt | 99 +++++++++++++++++++
1 file changed, 99 insertions(+)
diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
index bfe2805c5534..c120d2bde3bd 100644
--- a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
+++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
@@ -1,6 +1,8 @@
Binding for TI/National Semiconductor LP55xx LED Drivers
Required properties:
+- #address-cells: 1
+- #size-cells: 0
- compatible: one of
national,lp5521
national,lp5523
@@ -14,6 +16,18 @@ Required properties:
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.
+- reg: Output channel for the LED. This is zero based channel identifier and
+ the data sheet is a one based channel identifier.
+ reg value to output to LED output number
+ D1 = reg value is 0
+ D2 = reg value is 1
+ D3 = reg value is 2
+ D4 = reg value is 3
+ D5 = reg value is 4
+ D6 = reg value is 5
+ D7 = reg value is 6
+ D8 = reg value is 7
+ D9 = reg value is 8
Optional properties:
- enable-gpio: GPIO attached to the chip's enable pin
@@ -35,23 +49,28 @@ example 1) LP5521
on channel 0.
lp5521@32 {
+ #address-cells = <1>;
+ #size-cells = <0>;
compatible = "national,lp5521";
reg = <0x32>;
label = "lp5521_pri";
clock-mode = /bits/ 8 <2>;
chan0 {
+ reg = <0>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
linux,default-trigger = "heartbeat";
};
chan1 {
+ reg = <1>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
chan2 {
+ reg = <2>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
@@ -70,59 +89,70 @@ ASEL1 ASEL0 Address
VEN VEN 35h
lp5523@32 {
+ #address-cells = <1>;
+ #size-cells = <0>;
compatible = "national,lp5523";
reg = <0x32>;
clock-mode = /bits/ 8 <1>;
chan0 {
+ reg = <0>;
chan-name = "d1";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan1 {
+ reg = <1>;
chan-name = "d2";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan2 {
+ reg = <2>;
chan-name = "d3";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan3 {
+ reg = <3>;
chan-name = "d4";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan4 {
+ reg = <4>;
chan-name = "d5";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan5 {
+ reg = <5>;
chan-name = "d6";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan6 {
+ reg = <6>;
chan-name = "d7";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan7 {
+ reg = <7>;
chan-name = "d8";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan8 {
+ reg = <8>;
chan-name = "d9";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
@@ -133,29 +163,35 @@ example 3) LP5562
4 channels are defined.
lp5562@30 {
+ #address-cells = <1>;
+ #size-cells = <0>;
compatible = "ti,lp5562";
reg = <0x30>;
clock-mode = /bits/8 <2>;
chan0 {
+ reg = <0>;
chan-name = "R";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
chan1 {
+ reg = <1>;
chan-name = "G";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
chan2 {
+ reg = <2>;
chan-name = "B";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
chan3 {
+ reg = <3>;
chan-name = "W";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
@@ -167,62 +203,125 @@ example 4) LP8501
Others are same as LP5523.
lp8501@32 {
+ #address-cells = <1>;
+ #size-cells = <0>;
compatible = "ti,lp8501";
reg = <0x32>;
clock-mode = /bits/ 8 <2>;
pwr-sel = /bits/ 8 <3>; /* D1~9 connected to VOUT */
chan0 {
+ reg = <0>;
chan-name = "d1";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan1 {
+ reg = <1>;
chan-name = "d2";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan2 {
+ reg = <2>;
chan-name = "d3";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan3 {
+ reg = <3>;
chan-name = "d4";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan4 {
+ reg = <4>;
chan-name = "d5";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan5 {
+ reg = <5>;
chan-name = "d6";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan6 {
+ reg = <6>;
chan-name = "d7";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan7 {
+ reg = <7>;
chan-name = "d8";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan8 {
+ reg = <8>;
chan-name = "d9";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
};
+
+Multicolor Framework Support
+In addition to the nodes and properties defined above for device support the
+properties below are needed for multicolor framework support as defined in
+Documentation/devicetree/bindings/leds/leds-class-multicolor.txt
+
+Required child properties for multicolor framework
+ - color : Must be LED_COLOR_ID_MULTI
+ - function : see Documentation/devicetree/bindings/leds/common.txt
+
+Required grandchildren properties
+ - reg : This is the LED output of the device
+ - color : see Documentation/devicetree/bindings/leds/common.txt
+
+Multicolor LED example:
+lp5523: lp5523@32 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "national,lp5523";
+ reg = <0x32>;
+ clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
+
+ multi-led@2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <2>;
+ color = <LED_COLOR_ID_MULTI>;
+ function = LED_FUNCTION_STANDBY;
+ linux,default-trigger = "heartbeat";
+
+ led@0 {
+ led-cur = /bits/ 8 <50>;
+ max-cur = /bits/ 8 <100>;
+ reg = <0x0>;
+ color = <LED_COLOR_ID_GREEN>;
+ };
+
+ led@1 {
+ led-cur = /bits/ 8 <50>;
+ max-cur = /bits/ 8 <100>;
+ reg = <0x1>;
+ color = <LED_COLOR_ID_BLUE>;
+ };
+
+ led@6 {
+ led-cur = /bits/ 8 <50>;
+ max-cur = /bits/ 8 <100>;
+ reg = <0x6>;
+ color = <LED_COLOR_ID_RED>;
+ };
+ };
+};
--
2.22.0.214.g8dca754b1e
Introduce the LP5036/30/24/18/12/9 RGB LED driver.
The difference in these parts are the number of
LED outputs where the:
LP5036 can control 36 LEDs
LP5030 can control 30 LEDs
LP5024 can control 24 LEDs
LP5018 can control 18 LEDs
LP5012 can control 12 LEDs
LP5009 can control 9 LEDs
The device has the ability to group LED output into control banks
so that multiple LED banks can be controlled with the same mixing and
brightness. Inversely the LEDs can also be controlled independently.
Signed-off-by: Dan Murphy <[email protected]>
---
drivers/leds/Kconfig | 11 +
drivers/leds/Makefile | 1 +
drivers/leds/leds-lp50xx.c | 767 +++++++++++++++++++++++++++++++++++++
3 files changed, 779 insertions(+)
create mode 100644 drivers/leds/leds-lp50xx.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index cfb1ebb6517f..84f60e35c5ee 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -363,6 +363,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
+ help
+ If you say yes here you get support for the Texas Instruments
+ LP5036, LP5030, LP5024, LP5018, LP5012 and LP5009 LED driver.
+
+ To compile this driver as a module, choose M here: the
+ module will be called leds-lp50xx.
+
config LEDS_LP55XX_COMMON
tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501"
depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 841038cfe35b..7a208a0f7b84 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_GPIO_REGISTER) += leds-gpio-register.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.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_LP55XX_COMMON) += leds-lp55xx-common.o
obj-$(CONFIG_LEDS_LP5521) += leds-lp5521.o
obj-$(CONFIG_LEDS_LP5523) += leds-lp5523.o
diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
new file mode 100644
index 000000000000..a4654cc2bea5
--- /dev/null
+++ b/drivers/leds/leds-lp50xx.c
@@ -0,0 +1,767 @@
+// 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>
+
+#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)
+
+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 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 {
+ struct regmap_config lp50xx_regmap_config;
+ 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] = {
+ .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] = {
+ .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] = {
+ .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] = {
+ .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] = {
+ .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] = {
+ .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,
+ },
+};
+
+static int lp50xx_brightness_set(struct led_classdev *cdev,
+ enum led_brightness brightness)
+{
+ struct lp50xx_led *led = container_of(cdev, struct lp50xx_led, led_dev);
+ const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
+ struct led_mc_color_entry *color_data;
+ u8 led_offset, reg_val, reg_color_offset;
+ int ret = 0;
+
+ 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;
+ }
+
+ list_for_each_entry(color_data, &led->mc_cdev.color_list, list) {
+ if (color_data->led_color_id == LED_COLOR_ID_RED)
+ reg_color_offset = 0;
+ else if (color_data->led_color_id == LED_COLOR_ID_GREEN)
+ reg_color_offset = 1;
+ else if (color_data->led_color_id == LED_COLOR_ID_BLUE)
+ reg_color_offset = 2;
+ else
+ continue;
+
+ if (led->ctrl_bank_enabled) {
+ reg_val = led_chip->bank_mix_reg + reg_color_offset;
+ } else {
+ led_offset = (led->led_number * 3) + reg_color_offset;
+ reg_val = led_chip->mix_out0_reg + led_offset;
+ }
+
+ ret = regmap_write(led->priv->regmap, reg_val,
+ color_data->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 enum led_brightness lp50xx_brightness_get(struct led_classdev *cdev)
+{
+ struct lp50xx_led *led = container_of(cdev, struct lp50xx_led, led_dev);
+ const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
+ unsigned int brt_val;
+ u8 reg_val;
+ int ret;
+
+ 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_read(led->priv->regmap, reg_val, &brt_val);
+
+ mutex_unlock(&led->priv->lock);
+
+ return brt_val;
+}
+
+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->num_leds; 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 (led_config_hi)
+ 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];
+ struct fwnode_handle *child = NULL;
+ struct fwnode_handle *led_node = NULL;
+ struct led_init_data init_data;
+ struct lp50xx_led *led;
+ int num_colors;
+ u32 color_id;
+ int led_number;
+ size_t i = 0;
+ int ret;
+
+ priv->enable_gpio = devm_gpiod_get_optional(&priv->client->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->client->dev, "vled");
+ if (IS_ERR(priv->regulator))
+ priv->regulator = NULL;
+
+ device_for_each_child_node(&priv->client->dev, child) {
+ led = &priv->leds[i];
+ if (fwnode_property_present(child, "ti,led-bank")) {
+ ret = fwnode_property_read_u32_array(child,
+ "ti,led-bank",
+ NULL, 0);
+ ret = fwnode_property_read_u32_array(child,
+ "ti,led-bank",
+ led_banks,
+ ret);
+
+ priv->num_of_banked_leds = ARRAY_SIZE(led_banks);
+
+ 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);
+
+ led->led_number = led_number;
+ }
+ if (ret) {
+ dev_err(&priv->client->dev,
+ "led sourcing property missing\n");
+ fwnode_handle_put(child);
+ goto child_out;
+ }
+
+ if (led_number > priv->chip_info->num_leds) {
+ dev_err(&priv->client->dev,
+ "led-sources property is invalid\n");
+ ret = -EINVAL;
+ fwnode_handle_put(child);
+ goto child_out;
+ }
+
+ init_data.fwnode = child;
+ fwnode_property_read_string(child, "linux,default-trigger",
+ &led->led_dev.default_trigger);
+ num_colors = 0;
+
+ fwnode_for_each_child_node(child, led_node) {
+ ret = fwnode_property_read_u32(led_node, "color",
+ &color_id);
+ if (ret)
+ dev_err(&priv->client->dev,
+ "Cannot read color\n");
+
+ set_bit(color_id, &led->mc_cdev.available_colors);
+ num_colors++;
+
+ }
+
+ led->priv = priv;
+ led->mc_cdev.num_leds = num_colors;
+ led->mc_cdev.led_cdev = &led->led_dev;
+ led->led_dev.brightness_set_blocking = lp50xx_brightness_set;
+ led->led_dev.brightness_get = lp50xx_brightness_get;
+ ret = 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");
--
2.22.0.214.g8dca754b1e
Fix checkpatch errors and warnings for the LP5523.c device
driver.
Signed-off-by: Dan Murphy <[email protected]>
---
drivers/leds/leds-lp5523.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 8b2cdb98fed6..c4a94903f8c4 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -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;
--
2.22.0.214.g8dca754b1e
Add DT bindings for the LEDs multicolor class framework.
Signed-off-by: Dan Murphy <[email protected]>
---
.../bindings/leds/leds-class-multicolor.txt | 98 +++++++++++++++++++
1 file changed, 98 insertions(+)
create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.txt
diff --git a/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt b/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt
new file mode 100644
index 000000000000..8619c9bf1811
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt
@@ -0,0 +1,98 @@
+* Multicolor LED properties
+
+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.
+
+Required LED Child properties:
+ - color : For multicolor LED support this property should be defined as
+ LED_COLOR_ID_MULTI and further definition can be found in
+ include/linux/leds/common.h.
+
+led-controller@30 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "ti,lp5024";
+ reg = <0x29>;
+
+ multi-led@1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+ color = <LED_COLOR_ID_MULTI>;
+ function = LED_FUNCTION_STATUS;
+
+
+ led@3 {
+ reg = <3>;
+ color = <LED_COLOR_ID_RED>;
+ };
+
+ led@4 {
+ reg = <4>;
+ color = <LED_COLOR_ID_GREEN>;
+ };
+
+ led@5 {
+ reg = <5>;
+ color = <LED_COLOR_ID_BLUE>;
+ };
+ };
+
+ multi-led@2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ color = <LED_COLOR_ID_MULTI>;
+ function = LED_FUNCTION_ACTIVITY;
+ reg = <2>;
+ ti,led-bank = <2 3 5>;
+
+ led@6 {
+ reg = <0x6>;
+ color = <LED_COLOR_ID_RED>;
+ led-sources = <6 9 15>;
+ };
+
+ led@7 {
+ reg = <0x7>;
+ color = <LED_COLOR_ID_GREEN>;
+ led-sources = <7 10 16>;
+ };
+
+ led@8 {
+ reg = <0x8>;
+ color = <LED_COLOR_ID_BLUE>;
+ led-sources = <8 11 17>;
+ };
+ };
+
+ multi-led@4 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <4>;
+ color = <LED_COLOR_ID_MULTI>;
+ function = LED_FUNCTION_ACTIVITY;
+
+ led@12 {
+ reg = <12>;
+ color = <LED_COLOR_ID_RED>;
+ };
+
+ led@13 {
+ reg = <13>;
+ color = <LED_COLOR_ID_GREEN>;
+ };
+
+ led@14 {
+ reg = <14>;
+ color = <LED_COLOR_ID_BLUE>;
+ };
+ };
+
+};
--
2.22.0.214.g8dca754b1e
Update the document to be consistent in case when using LED.
This should be capital throughout the document.
Signed-off-by: Dan Murphy <[email protected]>
---
Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
index 1b66a413fb9d..bfe2805c5534 100644
--- a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
+++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
@@ -1,4 +1,4 @@
-Binding for TI/National Semiconductor LP55xx Led Drivers
+Binding for TI/National Semiconductor LP55xx LED Drivers
Required properties:
- compatible: one of
@@ -12,8 +12,8 @@ Required properties:
- 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.
+- 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
--
2.22.0.214.g8dca754b1e
Dan,
On 9/25/19 7:46 PM, Dan Murphy wrote:
> Introduce the LP5036/30/24/18/12/9 RGB LED driver.
> The difference in these parts are the number of
> LED outputs where the:
>
> LP5036 can control 36 LEDs
> LP5030 can control 30 LEDs
> LP5024 can control 24 LEDs
> LP5018 can control 18 LEDs
> LP5012 can control 12 LEDs
> LP5009 can control 9 LEDs
>
> The device has the ability to group LED output into control banks
> so that multiple LED banks can be controlled with the same mixing and
> brightness. Inversely the LEDs can also be controlled independently.
>
> Signed-off-by: Dan Murphy <[email protected]>
> ---
> drivers/leds/Kconfig | 11 +
> drivers/leds/Makefile | 1 +
> drivers/leds/leds-lp50xx.c | 767 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 779 insertions(+)
> create mode 100644 drivers/leds/leds-lp50xx.c
>
> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
> index cfb1ebb6517f..84f60e35c5ee 100644
> --- a/drivers/leds/Kconfig
> +++ b/drivers/leds/Kconfig
> @@ -363,6 +363,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
> + help
> + If you say yes here you get support for the Texas Instruments
> + LP5036, LP5030, LP5024, LP5018, LP5012 and LP5009 LED driver.
> +
> + To compile this driver as a module, choose M here: the
> + module will be called leds-lp50xx.
> +
> config LEDS_LP55XX_COMMON
> tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501"
> depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501
> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
> index 841038cfe35b..7a208a0f7b84 100644
> --- a/drivers/leds/Makefile
> +++ b/drivers/leds/Makefile
> @@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_GPIO_REGISTER) += leds-gpio-register.o
> obj-$(CONFIG_LEDS_GPIO) += leds-gpio.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_LP55XX_COMMON) += leds-lp55xx-common.o
> obj-$(CONFIG_LEDS_LP5521) += leds-lp5521.o
> obj-$(CONFIG_LEDS_LP5523) += leds-lp5523.o
> diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
> new file mode 100644
> index 000000000000..a4654cc2bea5
> --- /dev/null
> +++ b/drivers/leds/leds-lp50xx.c
> @@ -0,0 +1,767 @@
> +// 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>
> +
> +#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)
> +
> +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 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 {
> + struct regmap_config lp50xx_regmap_config;
> + 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] = {
> + .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] = {
> + .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] = {
> + .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] = {
> + .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] = {
> + .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] = {
> + .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,
> + },
> +};
> +
> +static int lp50xx_brightness_set(struct led_classdev *cdev,
> + enum led_brightness brightness)
> +{
> + struct lp50xx_led *led = container_of(cdev, struct lp50xx_led, led_dev);
> + const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
> + struct led_mc_color_entry *color_data;
> + u8 led_offset, reg_val, reg_color_offset;
> + int ret = 0;
> +
> + 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;
> + }
> +
> + list_for_each_entry(color_data, &led->mc_cdev.color_list, list) {
> + if (color_data->led_color_id == LED_COLOR_ID_RED)
> + reg_color_offset = 0;
> + else if (color_data->led_color_id == LED_COLOR_ID_GREEN)
> + reg_color_offset = 1;
> + else if (color_data->led_color_id == LED_COLOR_ID_BLUE)
> + reg_color_offset = 2;
> + else
> + continue;
This else case is quite erroneous. Sheer continue is just ignoring
serious problem. I'd log the problem and return -EINVAL.
Also, you could have a macro for mapping color_id to offset.
> +
> + if (led->ctrl_bank_enabled) {
> + reg_val = led_chip->bank_mix_reg + reg_color_offset;
> + } else {
> + led_offset = (led->led_number * 3) + reg_color_offset;
> + reg_val = led_chip->mix_out0_reg + led_offset;
> + }
> +
> + ret = regmap_write(led->priv->regmap, reg_val,
> + color_data->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 enum led_brightness lp50xx_brightness_get(struct led_classdev *cdev)
> +{
> + struct lp50xx_led *led = container_of(cdev, struct lp50xx_led, led_dev);
> + const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
> + unsigned int brt_val;
> + u8 reg_val;
> + int ret;
> +
> + 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_read(led->priv->regmap, reg_val, &brt_val);
> +
> + mutex_unlock(&led->priv->lock);
> +
> + return brt_val;
> +}
> +
> +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->num_leds; 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 (led_config_hi)
Now I think that less questionable would be writing led_config_hi always
for devices that have CFG1 register. IOW write led_config_hi also
when it equals 0.
> + 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];
> + struct fwnode_handle *child = NULL;
> + struct fwnode_handle *led_node = NULL;
> + struct led_init_data init_data;
> + struct lp50xx_led *led;
> + int num_colors;
> + u32 color_id;
> + int led_number;
> + size_t i = 0;
> + int ret;
> +
> + priv->enable_gpio = devm_gpiod_get_optional(&priv->client->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->client->dev, "vled");
> + if (IS_ERR(priv->regulator))
> + priv->regulator = NULL;
> +
> + device_for_each_child_node(&priv->client->dev, child) {
> + led = &priv->leds[i];
> + if (fwnode_property_present(child, "ti,led-bank")) {
> + ret = fwnode_property_read_u32_array(child,
> + "ti,led-bank",
> + NULL, 0);
> + ret = fwnode_property_read_u32_array(child,
> + "ti,led-bank",
> + led_banks,
> + ret);
> +
> + priv->num_of_banked_leds = ARRAY_SIZE(led_banks);
> +
> + 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);
Not checking ret val?
> +
> + led->led_number = led_number;
> + }
> + if (ret) {
> + dev_err(&priv->client->dev,
> + "led sourcing property missing\n");
> + fwnode_handle_put(child);
> + goto child_out;
> + }
> +
> + if (led_number > priv->chip_info->num_leds) {
> + dev_err(&priv->client->dev,
> + "led-sources property is invalid\n");
> + ret = -EINVAL;
> + fwnode_handle_put(child);
> + goto child_out;
> + }
> +
> + init_data.fwnode = child;
> + fwnode_property_read_string(child, "linux,default-trigger",
> + &led->led_dev.default_trigger);
> + num_colors = 0;
> +
> + fwnode_for_each_child_node(child, led_node) {
> + ret = fwnode_property_read_u32(led_node, "color",
> + &color_id);
> + if (ret)
> + dev_err(&priv->client->dev,
> + "Cannot read color\n");
> +
> + set_bit(color_id, &led->mc_cdev.available_colors);
> + num_colors++;
> +
> + }
> +
> + led->priv = priv;
> + led->mc_cdev.num_leds = num_colors;
> + led->mc_cdev.led_cdev = &led->led_dev;
> + led->led_dev.brightness_set_blocking = lp50xx_brightness_set;
> + led->led_dev.brightness_get = lp50xx_brightness_get;
> + ret = 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");
>
--
Best regards,
Jacek Anaszewski
Dan,
On 9/25/19 7:46 PM, Dan Murphy wrote:
> Update the document to be consistent in case when using LED.
s/LED/"LED"/.
> This should be capital throughout the document.
>
> Signed-off-by: Dan Murphy <[email protected]>
> ---
> Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
> index 1b66a413fb9d..bfe2805c5534 100644
> --- a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
> +++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
> @@ -1,4 +1,4 @@
> -Binding for TI/National Semiconductor LP55xx Led Drivers
> +Binding for TI/National Semiconductor LP55xx LED Drivers
>
> Required properties:
> - compatible: one of
> @@ -12,8 +12,8 @@ Required properties:
> - 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.
> +- 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
>
--
Best regards,
Jacek Anaszewski
Dan,
On 9/25/19 7:46 PM, Dan Murphy wrote:
> Update the DT binding to include the properties to use the
> multicolor framework for the devices that use the LP55xx
> framework.
>
> Signed-off-by: Dan Murphy <[email protected]>
> CC: Tony Lindgren <[email protected]>
> CC: "Benoît Cousson" <[email protected]>
> CC: Linus Walleij <[email protected]>
> CC: Shawn Guo <[email protected]>
> CC: Sascha Hauer <[email protected]>
> CC: Pengutronix Kernel Team <[email protected]>
> CC: Fabio Estevam <[email protected]>
> CC: NXP Linux Team <[email protected]>
> ---
> .../devicetree/bindings/leds/leds-lp55xx.txt | 99 +++++++++++++++++++
> 1 file changed, 99 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
> index bfe2805c5534..c120d2bde3bd 100644
> --- a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
> +++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
> @@ -1,6 +1,8 @@
> Binding for TI/National Semiconductor LP55xx LED Drivers
>
> Required properties:
> +- #address-cells: 1
> +- #size-cells: 0
> - compatible: one of
> national,lp5521
> national,lp5523
> @@ -14,6 +16,18 @@ Required properties:
> 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.
> +- reg: Output channel for the LED. This is zero based channel identifier and
> + the data sheet is a one based channel identifier.
> + reg value to output to LED output number
> + D1 = reg value is 0
> + D2 = reg value is 1
> + D3 = reg value is 2
> + D4 = reg value is 3
> + D5 = reg value is 4
> + D6 = reg value is 5
> + D7 = reg value is 6
> + D8 = reg value is 7
> + D9 = reg value is 8
>
> Optional properties:
> - enable-gpio: GPIO attached to the chip's enable pin
> @@ -35,23 +49,28 @@ example 1) LP5521
> on channel 0.
>
> lp5521@32 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> compatible = "national,lp5521";
> reg = <0x32>;
> label = "lp5521_pri";
> clock-mode = /bits/ 8 <2>;
>
> chan0 {
s/chan0/chan@0/
The same applies to the remaining occurrences in this file and to
the other patches from the patch set as already pointed out.
> + reg = <0>;
> led-cur = /bits/ 8 <0x2f>;
> max-cur = /bits/ 8 <0x5f>;
> linux,default-trigger = "heartbeat";
> };
>
--
Best regards,
Jacek Anaszewski
Jacek
On 9/25/19 4:31 PM, Jacek Anaszewski wrote:
> Dan,
>
> On 9/25/19 7:46 PM, Dan Murphy wrote:
>> Update the document to be consistent in case when using LED.
> s/LED/"LED"/.
ACK
>
>> This should be capital throughout the document.
>>
>> Signed-off-by: Dan Murphy <[email protected]>
>> ---
>> Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
>> index 1b66a413fb9d..bfe2805c5534 100644
>> --- a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
>> +++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
>> @@ -1,4 +1,4 @@
>> -Binding for TI/National Semiconductor LP55xx Led Drivers
>> +Binding for TI/National Semiconductor LP55xx LED Drivers
>>
>> Required properties:
>> - compatible: one of
>> @@ -12,8 +12,8 @@ Required properties:
>> - 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.
>> +- 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
>>
Jacek
On 9/25/19 4:34 PM, Jacek Anaszewski wrote:
> Dan,
>
> On 9/25/19 7:46 PM, Dan Murphy wrote:
>> Update the DT binding to include the properties to use the
>> multicolor framework for the devices that use the LP55xx
>> framework.
>>
>> Signed-off-by: Dan Murphy <[email protected]>
>> CC: Tony Lindgren <[email protected]>
>> CC: "Benoît Cousson" <[email protected]>
>> CC: Linus Walleij <[email protected]>
>> CC: Shawn Guo <[email protected]>
>> CC: Sascha Hauer <[email protected]>
>> CC: Pengutronix Kernel Team <[email protected]>
>> CC: Fabio Estevam <[email protected]>
>> CC: NXP Linux Team <[email protected]>
>> ---
>> .../devicetree/bindings/leds/leds-lp55xx.txt | 99 +++++++++++++++++++
>> 1 file changed, 99 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
>> index bfe2805c5534..c120d2bde3bd 100644
>> --- a/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
>> +++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.txt
>> @@ -1,6 +1,8 @@
>> Binding for TI/National Semiconductor LP55xx LED Drivers
>>
>> Required properties:
>> +- #address-cells: 1
>> +- #size-cells: 0
>> - compatible: one of
>> national,lp5521
>> national,lp5523
>> @@ -14,6 +16,18 @@ Required properties:
>> 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.
>> +- reg: Output channel for the LED. This is zero based channel identifier and
>> + the data sheet is a one based channel identifier.
>> + reg value to output to LED output number
>> + D1 = reg value is 0
>> + D2 = reg value is 1
>> + D3 = reg value is 2
>> + D4 = reg value is 3
>> + D5 = reg value is 4
>> + D6 = reg value is 5
>> + D7 = reg value is 6
>> + D8 = reg value is 7
>> + D9 = reg value is 8
>>
>> Optional properties:
>> - enable-gpio: GPIO attached to the chip's enable pin
>> @@ -35,23 +49,28 @@ example 1) LP5521
>> on channel 0.
>>
>> lp5521@32 {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> compatible = "national,lp5521";
>> reg = <0x32>;
>> label = "lp5521_pri";
>> clock-mode = /bits/ 8 <2>;
>>
>> chan0 {
> s/chan0/chan@0/
>
> The same applies to the remaining occurrences in this file and to
> the other patches from the patch set as already pointed out.
Ack. I have made the same change across all the DT patches in this series
Dan
>> + reg = <0>;
>> led-cur = /bits/ 8 <0x2f>;
>> max-cur = /bits/ 8 <0x5f>;
>> linux,default-trigger = "heartbeat";
>> };
>>
Jacek
On 9/25/19 4:27 PM, Jacek Anaszewski wrote:
> Dan,
>
> On 9/25/19 7:46 PM, Dan Murphy wrote:
<big_snip>
>> +
>> +static int lp50xx_brightness_set(struct led_classdev *cdev,
>> + enum led_brightness brightness)
>> +{
>> + struct lp50xx_led *led = container_of(cdev, struct lp50xx_led, led_dev);
>> + const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
>> + struct led_mc_color_entry *color_data;
>> + u8 led_offset, reg_val, reg_color_offset;
>> + int ret = 0;
>> +
>> + 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;
>> + }
>> +
>> + list_for_each_entry(color_data, &led->mc_cdev.color_list, list) {
>> + if (color_data->led_color_id == LED_COLOR_ID_RED)
>> + reg_color_offset = 0;
>> + else if (color_data->led_color_id == LED_COLOR_ID_GREEN)
>> + reg_color_offset = 1;
>> + else if (color_data->led_color_id == LED_COLOR_ID_BLUE)
>> + reg_color_offset = 2;
>> + else
>> + continue;
> This else case is quite erroneous. Sheer continue is just ignoring
> serious problem. I'd log the problem and return -EINVAL.
Ack.
>
> Also, you could have a macro for mapping color_id to offset.
If the code needed to do this more then once I could justify a macro.
But this is the only instance of this check.
>
>> +
>> + if (led->ctrl_bank_enabled) {
>> + reg_val = led_chip->bank_mix_reg + reg_color_offset;
>> + } else {
>> + led_offset = (led->led_number * 3) + reg_color_offset;
>> + reg_val = led_chip->mix_out0_reg + led_offset;
>> + }
>> +
>> + ret = regmap_write(led->priv->regmap, reg_val,
>> + color_data->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 enum led_brightness lp50xx_brightness_get(struct led_classdev *cdev)
>> +{
>> + struct lp50xx_led *led = container_of(cdev, struct lp50xx_led, led_dev);
>> + const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
>> + unsigned int brt_val;
>> + u8 reg_val;
>> + int ret;
>> +
>> + 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_read(led->priv->regmap, reg_val, &brt_val);
>> +
>> + mutex_unlock(&led->priv->lock);
>> +
>> + return brt_val;
>> +}
>> +
>> +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->num_leds; 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 (led_config_hi)
> Now I think that less questionable would be writing led_config_hi always
> for devices that have CFG1 register. IOW write led_config_hi also
> when it equals 0.
Ack. I will have to modify the check to only write this for LP5030/36
as those are the only 2 that have the CFG1 register.
>
>> + 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];
>> + struct fwnode_handle *child = NULL;
>> + struct fwnode_handle *led_node = NULL;
>> + struct led_init_data init_data;
>> + struct lp50xx_led *led;
>> + int num_colors;
>> + u32 color_id;
>> + int led_number;
>> + size_t i = 0;
>> + int ret;
>> +
>> + priv->enable_gpio = devm_gpiod_get_optional(&priv->client->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->client->dev, "vled");
>> + if (IS_ERR(priv->regulator))
>> + priv->regulator = NULL;
>> +
>> + device_for_each_child_node(&priv->client->dev, child) {
>> + led = &priv->leds[i];
>> + if (fwnode_property_present(child, "ti,led-bank")) {
>> + ret = fwnode_property_read_u32_array(child,
>> + "ti,led-bank",
>> + NULL, 0);
>> + ret = fwnode_property_read_u32_array(child,
>> + "ti,led-bank",
>> + led_banks,
>> + ret);
>> +
>> + priv->num_of_banked_leds = ARRAY_SIZE(led_banks);
>> +
>> + 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);
> Not checking ret val?
Yes it is after the else case. But I should probably check return for
the led-bank
>
>> +
>> + led->led_number = led_number;
>> + }
>> + if (ret) {
>> + dev_err(&priv->client->dev,
>> + "led sourcing property missing\n");
>> + fwnode_handle_put(child);
>> + goto child_out;
>> + }
>> +
Dan
[...]
Dan,
On 9/26/19 1:59 PM, Dan Murphy wrote:
> Jacek
>
> On 9/25/19 4:27 PM, Jacek Anaszewski wrote:
>> Dan,
>>
>> On 9/25/19 7:46 PM, Dan Murphy wrote:
>
> <big_snip>
>
>>> +
>>> +static int lp50xx_brightness_set(struct led_classdev *cdev,
>>> + enum led_brightness brightness)
>>> +{
>>> + struct lp50xx_led *led = container_of(cdev, struct lp50xx_led,
>>> led_dev);
>>> + const struct lp50xx_chip_info *led_chip = led->priv->chip_info;
>>> + struct led_mc_color_entry *color_data;
>>> + u8 led_offset, reg_val, reg_color_offset;
>>> + int ret = 0;
>>> +
>>> + 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;
>>> + }
>>> +
>>> + list_for_each_entry(color_data, &led->mc_cdev.color_list, list) {
>>> + if (color_data->led_color_id == LED_COLOR_ID_RED)
>>> + reg_color_offset = 0;
>>> + else if (color_data->led_color_id == LED_COLOR_ID_GREEN)
>>> + reg_color_offset = 1;
>>> + else if (color_data->led_color_id == LED_COLOR_ID_BLUE)
>>> + reg_color_offset = 2;
>>> + else
>>> + continue;
>> This else case is quite erroneous. Sheer continue is just ignoring
>> serious problem. I'd log the problem and return -EINVAL.
> Ack.
>>
>> Also, you could have a macro for mapping color_id to offset.
> If the code needed to do this more then once I could justify a macro.
> But this is the only instance of this check.
OK, at first glance I thought we could have a formula for that,
but this is not the case.
--
Best regards,
Jacek Anaszewski