Re: [PATCH 4/4] leds: lm3532: Introduce the lm3532 LED driver

[Dan Murphy]

Jacek

On 3/10/19 2:49 PM, Jacek Anaszewski wrote:
> Hi Dan,
> 
> Thank your for the patch.
> 
> I have some comments below, please take a look.
> 

Thanks for the review.  I have pushed v2 with some code changes but those changes that were
made seem to be outside your comments.

So I will implemnt these comments in v3.

> On 3/7/19 11:09 PM, Dan Murphy wrote:
>> Introduce the Texas Instruments LM3532 White LED driver.
>> The driver supports ALS configurability or manual brightness
>> control.
>>
>> The driver also supports associating LED strings with specific
>> control banks in a group or as individually controlled strings.
>>
>> Signed-off-by: Dan Murphy <dmurphy@xxxxxx>
>> ---
>> Â drivers/leds/KconfigÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 10 +
>> Â drivers/leds/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 1 +
>> Â drivers/leds/leds-lm3532.cÂÂÂÂÂÂÂÂÂÂÂÂ | 595 +++++++++++++++++++++++++
>> Â include/dt-bindings/leds/leds-lm3532.h |Â 72 +++
>> Â 4 files changed, 678 insertions(+)
>> Â create mode 100644 drivers/leds/leds-lm3532.c
>> Â create mode 100644 include/dt-bindings/leds/leds-lm3532.h
>>
>> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
>> index a72f97fca57b..da00b9ed5a5c 100644
>> --- a/drivers/leds/Kconfig
>> +++ b/drivers/leds/Kconfig
>> @@ -138,6 +138,16 @@ config LEDS_LM3530
>> ÂÂÂÂÂÂÂ controlled manually or using PWM input or using ambient
>> ÂÂÂÂÂÂÂ light automatically.
>> Â +config LEDS_LM3532
>> +ÂÂÂ tristate "LCD Backlight driver for LM3532"
>> +ÂÂÂ depends on LEDS_CLASS
>> +ÂÂÂ depends on I2C
>> +ÂÂÂ help
>> +ÂÂÂÂÂ This option enables support for the LCD backlight using
>> +ÂÂÂÂÂ LM3532 ambient light sensor chip. This ALS chip can be
>> +ÂÂÂÂÂ controlled manually or using PWM input or using ambient
>> +ÂÂÂÂÂ light automatically.
>> +
>> Â config LEDS_LM3533
>> ÂÂÂÂÂ tristate "LED support for LM3533"
>> ÂÂÂÂÂ depends on LEDS_CLASS
>> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
>> index 4c1b0054f379..7a8b1f55d459 100644
>> --- a/drivers/leds/Makefile
>> +++ b/drivers/leds/Makefile
>> @@ -18,6 +18,7 @@ obj-$(CONFIG_LEDS_BD2802)ÂÂÂÂÂÂÂ += leds-bd2802.o
>> Â obj-$(CONFIG_LEDS_CPCAP)ÂÂÂÂÂÂÂ += leds-cpcap.o
>> Â obj-$(CONFIG_LEDS_LOCOMO)ÂÂÂÂÂÂÂ += leds-locomo.o
>> Â obj-$(CONFIG_LEDS_LM3530)ÂÂÂÂÂÂÂ += leds-lm3530.o
>> +obj-$(CONFIG_LEDS_LM3532)ÂÂÂÂÂÂÂ += leds-lm3532.o
>> Â obj-$(CONFIG_LEDS_LM3533)ÂÂÂÂÂÂÂ += leds-lm3533.o
>> Â obj-$(CONFIG_LEDS_LM3642)ÂÂÂÂÂÂÂ += leds-lm3642.o
>> Â obj-$(CONFIG_LEDS_MIKROTIK_RB532)ÂÂÂ += leds-rb532.o
>> diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
>> new file mode 100644
>> index 000000000000..005478359d06
>> --- /dev/null
>> +++ b/drivers/leds/leds-lm3532.c
>> @@ -0,0 +1,595 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +// TI LM3532 LED driver
>> +// Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
>> +
>> +#include <linux/i2c.h>
>> +#include <linux/leds.h>
>> +#include <linux/slab.h>
>> +#include <linux/regmap.h>
>> +#include <linux/input.h>
>> +#include <linux/types.h>
>> +#include <linux/regulator/consumer.h>
>> +#include <linux/module.h>
>> +#include <uapi/linux/uleds.h>
>> +#include <linux/gpio/consumer.h>
>> +
>> +#include <dt-bindings/leds/leds-lm3532.h>
>> +
>> +#define LM3532_NAME "lm3532-led"
>> +
>> +#define LM3532_REG_OUTPUT_CFGÂÂÂ 0x10
>> +#define LM3532_REG_STARTSHUT_RAMPÂÂÂ 0x11
>> +#define LM3532_REG_RT_RAMPÂÂÂ 0x12
>> +#define LM3532_REG_PWM_A_CFGÂÂÂ 0x13
>> +#define LM3532_REG_PWM_B_CFGÂÂÂ 0x14
>> +#define LM3532_REG_PWM_C_CFGÂÂÂ 0x15
>> +#define LM3532_REG_ZONE_CFG_AÂÂÂ 0x16
>> +#define LM3532_REG_CTRL_A_BRTÂÂÂ 0x17
>> +#define LM3532_REG_ZONE_CFG_BÂÂÂ 0x18
>> +#define LM3532_REG_CTRL_B_BRTÂÂÂ 0x19
>> +#define LM3532_REG_ZONE_CFG_CÂÂÂ 0x1a
>> +#define LM3532_REG_CTRL_C_BRTÂÂÂ 0x1b
>> +#define LM3532_REG_ENABLEÂÂÂ 0x1d
>> +#define LM3532_ALS_CONFIGÂÂÂ 0x23
>> +#define LM3532_REG_ZN_0_HIÂÂÂ 0x60
>> +#define LM3532_REG_ZN_0_LOÂÂÂ 0x61
>> +#define LM3532_REG_ZN_1_HIÂÂÂ 0x62
>> +#define LM3532_REG_ZN_1_LOÂÂÂ 0x63
>> +#define LM3532_REG_ZN_2_HIÂÂÂ 0x64
>> +#define LM3532_REG_ZN_2_LOÂÂÂ 0x65
>> +#define LM3532_REG_ZN_3_HIÂÂÂ 0x66
>> +#define LM3532_REG_ZN_3_LOÂÂÂ 0x67
>> +#define LM3532_REG_MAXÂÂÂÂÂÂÂ 0x7e
>> +
>> +/* Contorl Enable */
>> +#define LM3532_CTRL_A_ENABLEÂÂÂ BIT(0)
>> +#define LM3532_CTRL_B_ENABLEÂÂÂ BIT(1)
>> +#define LM3532_CTRL_C_ENABLEÂÂÂ BIT(2)
>> +
>> +/* PWM Zone Control */
>> +#define LM3532_PWM_ZONE_MASKÂÂÂ 0x7c
>> +#define LM3532_PWM_ZONE_0_ENÂÂÂ BIT(2)
>> +#define LM3532_PWM_ZONE_1_ENÂÂÂ BIT(3)
>> +#define LM3532_PWM_ZONE_2_ENÂÂÂ BIT(4)
>> +#define LM3532_PWM_ZONE_3_ENÂÂÂ BIT(5)
>> +#define LM3532_PWM_ZONE_4_ENÂÂÂ BIT(6)
>> +
>> +/* Brightness Configuration */
>> +#define LM3532_I2C_CTRLÂÂÂÂÂÂÂ BIT(0)
>> +#define LM3532_LINEAR_MAPÂÂÂ BIT(1)
>> +#define LM3532_ZONE_MASKÂÂÂ (BIT(2) | BIT(3) | BIT(4))
>> +#define LM3532_ZONE_0ÂÂÂÂÂÂÂ 0
>> +#define LM3532_ZONE_1ÂÂÂÂÂÂÂ BIT(2)
>> +#define LM3532_ZONE_2ÂÂÂÂÂÂÂ BIT(3)
>> +#define LM3532_ZONE_3ÂÂÂÂÂÂÂ (BIT(2) | BIT(3))
>> +#define LM3532_ZONE_4ÂÂÂÂÂÂÂ BIT(4)
>> +
>> +#define LM3532_ENABLE_ALSÂÂÂ BIT(3)
>> +#define LM3532_ALS_SEL_SHIFTÂÂÂ 6
>> +
>> +/* Zone Boundary Register */
>> +#define LM3532_ALS_WINDOW_mVÂÂÂ 2000
>> +#define LM3532_ALS_ZB_MAXÂÂÂ 4
>> +#define LM3532_ALS_OFFSET_mVÂÂÂ 2
>> +
>> +#define LM3532_CONTROL_AÂÂÂ 0
>> +#define LM3532_CONTROL_BÂÂÂ 1
>> +#define LM3532_CONTROL_CÂÂÂ 2
>> +#define LM3532_MAX_CONTROL_BANKS 3
>> +#define LM3532_MAX_LED_STRINGSÂÂÂ 3
>> +
>> +#define LM3532_OUTPUT_CFG_MASKÂÂÂ 0x3
>> +#define LM3532_BRT_VAL_ADJUSTÂÂÂ 8
>> +#define LM3532_RAMP_DOWN_SHIFTÂÂÂ 3
>> +
>> +/*
>> + * struct lm3532_als_data
>> + * @config - value of ALS configuration register
>> + * @als1_imp_sel - value of ALS1 resistor select register
>> + * @als2_imp_sel - value of ALS2 resistor select register
>> + * @als_avrg_time - ALS averaging time
>> + * @als_input_mode - ALS input mode for brightness control
>> + * @als_vmin - Minimum ALS voltage
>> + * @als_vmax - Maximum ALS voltage
>> + * @zone_lo - values of ALS lo ZB(Zone Boundary) registers
>> + * @zone_hi - values of ALS hi ZB(Zone Boundary) registers
>> + */
>> +struct lm3532_als_data {
>> +ÂÂÂ u8 config;
>> +ÂÂÂ u8 als1_imp_sel;
>> +ÂÂÂ u8 als2_imp_sel;
>> +ÂÂÂ u8 als_avrg_time;
>> +ÂÂÂ u8 als_input_mode;
>> +ÂÂÂ u32 als_vmin;
>> +ÂÂÂ u32 als_vmax;
>> +ÂÂÂ u8 zones_lo[LM3532_ALS_ZB_MAX];
>> +ÂÂÂ u8 zones_hi[LM3532_ALS_ZB_MAX];
>> +};
>> +
>> +/**
>> + * struct lm3532_led
>> + * @led_dev: led class device
>> + * @priv - Pointer the device data structure
>> + * @control_bank - Control bank the LED is associated to
>> + * @mode - Mode of the LED string
>> + * @num_leds - Number of LED strings are supported in this array
>> + * @led_strings - The LED strings supported in this array
>> + * @label - LED label
>> + */
>> +struct lm3532_led {
>> +ÂÂÂ struct led_classdev led_dev;
>> +ÂÂÂ struct lm3532_data *priv;
>> +
>> +ÂÂÂ int control_bank;
>> +ÂÂÂ int mode;
>> +ÂÂÂ int num_leds;
>> +ÂÂÂ u32 led_strings[LM3532_MAX_CONTROL_BANKS];
>> +ÂÂÂ char label[LED_MAX_NAME_SIZE];
>> +};
>> +
>> +/**
>> + * struct lm3532_data
>> + * @enable_gpio - Hardware enable gpio
>> + * @regulator: regulator
>> + * @client: i2c client
>> + * @regmap - Devices register map
>> + * @dev - Pointer to the devices device struct
>> + * @lock - Lock for reading/writing the device
>> + * @als_data - Pointer to the als data struct
>> + * @runtime_ramp_up - Runtime ramp up setting
>> + * @runtime_ramp_down - Runtime ramp down setting
>> + * @leds - Array of LED strings
>> + */
>> +struct lm3532_data {
>> +ÂÂÂ struct gpio_desc *enable_gpio;
>> +ÂÂÂ struct regulator *regulator;
>> +ÂÂÂ struct i2c_client *client;
>> +ÂÂÂ struct regmap *regmap;
>> +ÂÂÂ struct device *dev;
>> +ÂÂÂ struct mutex lock;
>> +
>> +ÂÂÂ struct lm3532_als_data *als_data;
>> +
>> +ÂÂÂ u32 runtime_ramp_up;
>> +ÂÂÂ u32 runtime_ramp_down;
>> +
>> +ÂÂÂ struct lm3532_led leds[];
>> +};
>> +
>> +static const struct reg_default lm3532_reg_defs[] = {
>> +ÂÂÂ {LM3532_REG_OUTPUT_CFG, 0xe4},
>> +ÂÂÂ {LM3532_REG_STARTSHUT_RAMP, 0xc0},
>> +ÂÂÂ {LM3532_REG_RT_RAMP, 0xc0},
>> +ÂÂÂ {LM3532_REG_PWM_A_CFG, 0x82},
>> +ÂÂÂ {LM3532_REG_PWM_B_CFG, 0x82},
>> +ÂÂÂ {LM3532_REG_PWM_C_CFG, 0x82},
>> +ÂÂÂ {LM3532_REG_ZONE_CFG_A, 0xf1},
>> +ÂÂÂ {LM3532_REG_CTRL_A_BRT, 0xf3},
>> +ÂÂÂ {LM3532_REG_ZONE_CFG_B, 0xf1},
>> +ÂÂÂ {LM3532_REG_CTRL_B_BRT, 0xf3},
>> +ÂÂÂ {LM3532_REG_ZONE_CFG_C, 0xf1},
>> +ÂÂÂ {LM3532_REG_CTRL_C_BRT, 0xf3},
>> +ÂÂÂ {LM3532_REG_ENABLE, 0xf8},
>> +ÂÂÂ {LM3532_ALS_CONFIG, 0x44},
>> +ÂÂÂ {LM3532_REG_ZN_0_HI, 0x35},
>> +ÂÂÂ {LM3532_REG_ZN_0_LO, 0x33},
>> +ÂÂÂ {LM3532_REG_ZN_1_HI, 0x6a},
>> +ÂÂÂ {LM3532_REG_ZN_1_LO, 0x66},
>> +ÂÂÂ {LM3532_REG_ZN_2_HI, 0xa1},
>> +ÂÂÂ {LM3532_REG_ZN_2_LO, 0x99},
>> +ÂÂÂ {LM3532_REG_ZN_3_HI, 0xdc},
>> +ÂÂÂ {LM3532_REG_ZN_3_LO, 0xcc},
>> +};
>> +
>> +static const struct regmap_config lm3532_regmap_config = {
>> +ÂÂÂ .reg_bits = 8,
>> +ÂÂÂ .val_bits = 8,
>> +
>> +ÂÂÂ .max_register = LM3532_REG_MAX,
>> +ÂÂÂ .reg_defaults = lm3532_reg_defs,
>> +ÂÂÂ .num_reg_defaults = ARRAY_SIZE(lm3532_reg_defs),
>> +ÂÂÂ .cache_type = REGCACHE_FLAT,
>> +};
>> +
>> +static int lm3532_led_enable(struct lm3532_led *led_data)
>> +{
>> +ÂÂÂ int ctrl_en_val;
>> +ÂÂÂ int ret;
>> +
>> +ÂÂÂ switch (led_data->control_bank) {
>> +ÂÂÂ case LM3532_CONTROL_A:
>> +ÂÂÂÂÂÂÂ ctrl_en_val = LM3532_CTRL_A_ENABLE;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ case LM3532_CONTROL_B:
>> +ÂÂÂÂÂÂÂ ctrl_en_val = LM3532_CTRL_B_ENABLE;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ case LM3532_CONTROL_C:
>> +ÂÂÂÂÂÂÂ ctrl_en_val = LM3532_CTRL_C_ENABLE;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ default:
>> +ÂÂÂÂÂÂÂ dev_err(led_data->priv->dev, "Invalid control bank\n");
> 
> If control_bank was validated in lm3532_parse_node(), then you wouldn't
> have to take into account this option here.
> 
> Besides, you don't need this switch statement, but can easily calculate
> ctrl_en_val:
> 
> #define LM3532_GET_CTRL_BANK_EN_VAL(bank_id) BIT(bank_id)
> 

Ack.  Probably don't even need the macro for this.

ctrl_en_val = BIT(led_data->control_bank);

>> +ÂÂÂÂÂÂÂ return -EINVAL;
>> +ÂÂÂ };
>> +
>> +ÂÂÂ ret = regmap_update_bits(led_data->priv->regmap, LM3532_REG_ENABLE,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ctrl_en_val, ctrl_en_val);
>> +ÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂ dev_err(led_data->priv->dev, "Failed to set ctrl:%d\n", ret);
>> +ÂÂÂÂÂÂÂ return ret;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ return regulator_enable(led_data->priv->regulator);
>> +}
>> +
>> +static int lm3532_led_disable(struct lm3532_led *led_data)
>> +{
>> +ÂÂÂ int ctrl_en_val;
>> +ÂÂÂ int ret;
>> +
>> +ÂÂÂ switch (led_data->control_bank) {
>> +ÂÂÂ case LM3532_CONTROL_A:
>> +ÂÂÂÂÂÂÂ ctrl_en_val = LM3532_CTRL_A_ENABLE;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ case LM3532_CONTROL_B:
>> +ÂÂÂÂÂÂÂ ctrl_en_val = LM3532_CTRL_B_ENABLE;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ case LM3532_CONTROL_C:
>> +ÂÂÂÂÂÂÂ ctrl_en_val = LM3532_CTRL_C_ENABLE;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ default:
>> +ÂÂÂÂÂÂÂ dev_err(led_data->priv->dev, "Invalid control bank\n");
>> +ÂÂÂÂÂÂÂ return -EINVAL;
>> +ÂÂÂ };
> 
> Ditto.
> 

Ack  Same as above

>> +
>> +ÂÂÂ ret = regmap_update_bits(led_data->priv->regmap, LM3532_REG_ENABLE,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ctrl_en_val, ~ctrl_en_val);
>> +ÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂ dev_err(led_data->priv->dev, "Failed to set ctrl:%d\n", ret);
>> +ÂÂÂÂÂÂÂ return ret;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ return regulator_disable(led_data->priv->regulator);
>> +}
>> +
>> +static int lm3532_brightness_set(struct led_classdev *led_cdev,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ enum led_brightness brt_val)
>> +{
>> +ÂÂÂ struct lm3532_led *led =
>> +ÂÂÂÂÂÂÂÂÂÂÂ container_of(led_cdev, struct lm3532_led, led_dev);
>> +ÂÂÂ u8 brightnes_reg;
>> +ÂÂÂ int ret;
>> +
>> +ÂÂÂ mutex_lock(&led->priv->lock);
>> +
>> +ÂÂÂ if (led->mode == LM3532_BL_MODE_ALS) {
>> +ÂÂÂÂÂÂÂ ret = 0;
>> +ÂÂÂÂÂÂÂ goto unlock;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ switch (led->control_bank) {
>> +ÂÂÂ case LM3532_CONTROL_A:
>> +ÂÂÂÂÂÂÂ brightnes_reg = LM3532_REG_CTRL_A_BRT;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ case LM3532_CONTROL_B:
>> +ÂÂÂÂÂÂÂ brightnes_reg = LM3532_REG_CTRL_B_BRT;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ case LM3532_CONTROL_C:
>> +ÂÂÂÂÂÂÂ brightnes_reg = LM3532_REG_CTRL_C_BRT;
>> +ÂÂÂÂÂÂÂ break;
>> +ÂÂÂ default:
>> +ÂÂÂÂÂÂÂ dev_err(led->priv->dev, "Invalid control bank\n");
>> +ÂÂÂÂÂÂÂ ret = -EINVAL;
>> +ÂÂÂÂÂÂÂ goto unlock;
>> +ÂÂÂ };
> 
> Similarly here. use following macro:
> 
> #define LM3532_GET_CTRL_BANK_BRT_REG (bank_id) BIT((LM3532_REG_CTRL_A_BRT + bank_id*2))
> 

Ack. Probably don't need a macro since it is only used once.

brightness_reg = LM3532_REG_CTRL_A_BRT + led->control_bank * 2

>> +ÂÂÂ if (brt_val == LED_OFF) {
>> +ÂÂÂÂÂÂÂ ret = lm3532_led_disable(led);
>> +ÂÂÂÂÂÂÂ goto unlock;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ lm3532_led_enable(led);
>> +ÂÂÂ brt_val = brt_val / LM3532_BRT_VAL_ADJUST;
>> +
>> +ÂÂÂ ret = regmap_write(led->priv->regmap, brightnes_reg, brt_val);
>> +
>> +unlock:
>> +ÂÂÂ mutex_unlock(&led->priv->lock);
>> +ÂÂÂ return ret;
>> +}
>> +
>> +static int lm3532_init_registers(struct lm3532_led *led)
>> +{
>> +ÂÂÂ struct lm3532_data *drvdata = led->priv;
>> +ÂÂÂ unsigned int runtime_ramp_val;
>> +ÂÂÂ unsigned int output_cfg_val = 0;
>> +ÂÂÂ unsigned int output_cfg_shift = 0;
>> +ÂÂÂ unsigned int output_cfg_mask = 0;
>> +ÂÂÂ int ret, i;
>> +
>> +ÂÂÂ for (i = 0; i < led->num_leds; i++) {
>> +ÂÂÂÂÂÂÂ output_cfg_shift = led->led_strings[i] * 2;
>> +ÂÂÂÂÂÂÂ output_cfg_val |= (led->control_bank << output_cfg_shift);
>> +ÂÂÂÂÂÂÂ output_cfg_mask |= LM3532_OUTPUT_CFG_MASK << output_cfg_shift;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ ret = regmap_update_bits(drvdata->regmap, LM3532_REG_OUTPUT_CFG,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ output_cfg_mask, output_cfg_val);
>> +
>> +ÂÂÂ runtime_ramp_val = drvdata->runtime_ramp_up |
>> +ÂÂÂÂÂÂÂÂÂÂÂÂ (drvdata->runtime_ramp_down << LM3532_RAMP_DOWN_SHIFT);
>> +
>> +ÂÂÂ return regmap_write(drvdata->regmap, LM3532_REG_RT_RAMP,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ runtime_ramp_val);
>> +}
>> +
>> +static int lm3532_als_configure(struct lm3532_data *priv)
>> +{
>> +ÂÂÂ struct lm3532_als_data *als = priv->als_data;
>> +ÂÂÂ u32 als_vmin, als_vmax, als_vstep;
>> +ÂÂÂ int zone_reg = LM3532_REG_ZN_0_HI;
>> +ÂÂÂ int ret;
>> +ÂÂÂ int i;
>> +
>> +ÂÂÂ als_vmin = als->als_vmin;
>> +ÂÂÂ als_vmax = als->als_vmax;
>> +
>> +ÂÂÂ als_vstep = (als_vmax - als_vmin) / ((LM3532_ALS_ZB_MAX + 1) * 2);
>> +
>> +ÂÂÂ for (i = 0; i < LM3532_ALS_ZB_MAX; i++) {
>> +ÂÂÂÂÂÂÂ als->zones_lo[i] = ((als_vmin + als_vstep + (i * als_vstep)) *
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ LED_FULL) / 1000;
>> +ÂÂÂÂÂÂÂ als->zones_hi[i] = ((als_vmin + LM3532_ALS_OFFSET_mV +
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ als_vstep + (i * als_vstep)) * LED_FULL) / 1000;
>> +
>> +ÂÂÂÂÂÂÂ zone_reg = LM3532_REG_ZN_0_HI + i * 2;
>> +ÂÂÂÂÂÂÂ ret = regmap_write(priv->regmap, zone_reg, als->zones_lo[i]);
>> +ÂÂÂÂÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂÂÂÂÂ return ret;
>> +
>> +ÂÂÂÂÂÂÂ zone_reg += 1;
>> +ÂÂÂÂÂÂÂ ret = regmap_write(priv->regmap, zone_reg, als->zones_hi[i]);
>> +ÂÂÂÂÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂÂÂÂÂ return ret;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ als->config = (als->als_avrg_time | (LM3532_ENABLE_ALS) |
>> +ÂÂÂÂÂÂÂ (als->als_input_mode << LM3532_ALS_SEL_SHIFT));
>> +
>> +ÂÂÂ return regmap_write(priv->regmap, LM3532_ALS_CONFIG, als->config);
>> +}
>> +
>> +static int lm3532_parse_als(struct lm3532_data *priv)
>> +{
>> +ÂÂÂ struct lm3532_als_data *als;
>> +ÂÂÂ int ret;
>> +
>> +ÂÂÂ als = devm_kzalloc(priv->dev, sizeof(*als), GFP_KERNEL);
>> +ÂÂÂ if (als == NULL)
>> +ÂÂÂÂÂÂÂ return -ENOMEM;
>> +
>> +ÂÂÂ ret = device_property_read_u32(&priv->client->dev, "als-vmin",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &als->als_vmin);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ als->als_vmin = 0;
>> +
>> +ÂÂÂ ret = device_property_read_u32(&priv->client->dev, "als-vmax",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &als->als_vmax);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ als->als_vmax = LM3532_ALS_WINDOW_mV;
>> +
>> +ÂÂÂ ret = device_property_read_u8(&priv->client->dev, "als1-imp-sel",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &als->als1_imp_sel);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ als->als1_imp_sel = 0;
>> +
>> +ÂÂÂ ret = device_property_read_u8(&priv->client->dev, "als2-imp-sel",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &als->als2_imp_sel);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ als->als2_imp_sel = 0;
>> +
>> +ÂÂÂ ret = device_property_read_u8(&priv->client->dev, "als-avrg-time",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &als->als_avrg_time);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ als->als_avrg_time = 0;
>> +
>> +ÂÂÂ ret = device_property_read_u8(&priv->client->dev, "als-input-mode",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &als->als_input_mode);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ als->als_input_mode = 0;
>> +
>> +ÂÂÂ priv->als_data = als;
>> +
>> +ÂÂÂ return ret;
>> +}
>> +
>> +static int lm3532_parse_node(struct lm3532_data *priv)
>> +{
>> +ÂÂÂ struct fwnode_handle *child = NULL;
>> +ÂÂÂ struct lm3532_led *led;
>> +ÂÂÂ const char *name;
>> +ÂÂÂ int control_bank;
>> +ÂÂÂ 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))
>> +ÂÂÂÂÂÂÂ priv->enable_gpio = NULL;
>> +
>> +ÂÂÂ priv->regulator = devm_regulator_get(&priv->client->dev, "vin");
>> +ÂÂÂ if (IS_ERR(priv->regulator))
>> +ÂÂÂÂÂÂÂ priv->regulator = NULL;
>> +
>> +ÂÂÂ ret = device_property_read_u32(&priv->client->dev, "ramp-down-ms",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &priv->runtime_ramp_up);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ dev_info(&priv->client->dev, "ramp-down-ms property missing\n");
>> +
>> +ÂÂÂ ret = device_property_read_u32(&priv->client->dev, "ramp-down-ms",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &priv->runtime_ramp_down);
>> +ÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂ dev_info(&priv->client->dev, "ramp-down-ms property missing\n");
>> +
>> +ÂÂÂ device_for_each_child_node(priv->dev, child) {
>> +ÂÂÂÂÂÂÂ led = &priv->leds[i];
>> +
>> +ÂÂÂÂÂÂÂ ret = fwnode_property_read_u32(child, "reg", &control_bank);
>> +ÂÂÂÂÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "reg property missing\n");
>> +ÂÂÂÂÂÂÂÂÂÂÂ fwnode_handle_put(child);
>> +ÂÂÂÂÂÂÂÂÂÂÂ goto child_out;
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ if (control_bank > LM3532_CONTROL_C) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "Control bank invalid\n");
>> +ÂÂÂÂÂÂÂÂÂÂÂ continue;
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ led->control_bank = control_bank;
>> +
>> +ÂÂÂÂÂÂÂ ret = fwnode_property_read_u32(child, "ti,led-mode",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &led->mode);
>> +ÂÂÂÂÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "ti,led-mode property missing\n");
>> +ÂÂÂÂÂÂÂÂÂÂÂ fwnode_handle_put(child);
>> +ÂÂÂÂÂÂÂÂÂÂÂ goto child_out;
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ if (led->mode == LM3532_BL_MODE_ALS) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ ret = lm3532_parse_als(priv);
>> +ÂÂÂÂÂÂÂÂÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "Failed to parse als\n");
>> +ÂÂÂÂÂÂÂÂÂÂÂ else
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ lm3532_als_configure(priv);
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ led->num_leds = fwnode_property_read_u32_array(child,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ "led-sources",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ NULL, 0);
>> +
>> +ÂÂÂÂÂÂÂ if (led->num_leds > LM3532_MAX_LED_STRINGS) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "To many LED string defined\n");
>> +ÂÂÂÂÂÂÂÂÂÂÂ continue;
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ ret = fwnode_property_read_u32_array(child, "led-sources",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ led->led_strings,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ led->num_leds);
>> +ÂÂÂÂÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "led-sources property missing\n");
>> +ÂÂÂÂÂÂÂÂÂÂÂ fwnode_handle_put(child);
>> +ÂÂÂÂÂÂÂÂÂÂÂ goto child_out;
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ fwnode_property_read_string(child, "linux,default-trigger",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &led->led_dev.default_trigger);
>> +
>> +ÂÂÂÂÂÂÂ ret = fwnode_property_read_string(child, "label", &name);
>> +ÂÂÂÂÂÂÂ if (ret)
>> +ÂÂÂÂÂÂÂÂÂÂÂ snprintf(led->label, sizeof(led->label),
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ "%s::", priv->client->name);
>> +ÂÂÂÂÂÂÂ else
>> +ÂÂÂÂÂÂÂÂÂÂÂ snprintf(led->label, sizeof(led->label),
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ "%s:%s", priv->client->name, name);
>> +
>> +ÂÂÂÂÂÂÂ led->priv = priv;
>> +ÂÂÂÂÂÂÂ led->led_dev.name = led->label;
>> +ÂÂÂÂÂÂÂ led->led_dev.brightness_set_blocking = lm3532_brightness_set;
>> +
>> +ÂÂÂÂÂÂÂ ret = devm_led_classdev_register(priv->dev, &led->led_dev);
>> +ÂÂÂÂÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂÂÂÂÂ dev_err(&priv->client->dev, "led register err: %d\n",
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ret);
>> +ÂÂÂÂÂÂÂÂÂÂÂ fwnode_handle_put(child);
>> +ÂÂÂÂÂÂÂÂÂÂÂ goto child_out;
>> +ÂÂÂÂÂÂÂ }
>> +
>> +ÂÂÂÂÂÂÂ lm3532_init_registers(led);
>> +
>> +ÂÂÂÂÂÂÂ i++;
>> +ÂÂÂ }
>> +
>> +child_out:
>> +ÂÂÂ return ret;
>> +}
>> +
>> +static int lm3532_probe(struct i2c_client *client,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ const struct i2c_device_id *id)
>> +{
>> +ÂÂÂ struct lm3532_data *drvdata;
>> +ÂÂÂ int ret = 0;
>> +ÂÂÂ int count;
>> +
>> +ÂÂÂ count = device_get_child_node_count(&client->dev);
>> +ÂÂÂ if (!count) {
>> +ÂÂÂÂÂÂÂ dev_err(&client->dev, "LEDs are not defined in device tree!");
>> +ÂÂÂÂÂÂÂ return -ENODEV;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ drvdata = devm_kzalloc(&client->dev, struct_size(drvdata, leds, count),
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ GFP_KERNEL);
>> +ÂÂÂ if (drvdata == NULL)
>> +ÂÂÂÂÂÂÂ return -ENOMEM;
>> +
>> +ÂÂÂ drvdata->client = client;
>> +ÂÂÂ drvdata->dev = &client->dev;
>> +
>> +ÂÂÂ drvdata->regmap = devm_regmap_init_i2c(client, &lm3532_regmap_config);
>> +ÂÂÂ if (IS_ERR(drvdata->regmap)) {
>> +ÂÂÂÂÂÂÂ ret = PTR_ERR(drvdata->regmap);
>> +ÂÂÂÂÂÂÂ dev_err(&client->dev, "Failed to allocate register map: %d\n",
>> +ÂÂÂÂÂÂÂÂÂÂÂ ret);
>> +ÂÂÂÂÂÂÂ return ret;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ mutex_init(&drvdata->lock);
>> +ÂÂÂ i2c_set_clientdata(client, drvdata);
>> +
>> +ÂÂÂ ret = lm3532_parse_node(drvdata);
>> +ÂÂÂ if (ret) {
>> +ÂÂÂÂÂÂÂ dev_err(&client->dev, "Failed to parse node\n");
>> +ÂÂÂÂÂÂÂ return ret;
>> +ÂÂÂ }
>> +
>> +ÂÂÂ if (drvdata->enable_gpio)
>> +ÂÂÂÂÂÂÂ gpiod_direction_output(drvdata->enable_gpio, 1);
>> +
>> +ÂÂÂ return ret;
>> +}
>> +
>> +static int lm3532_remove(struct i2c_client *client)
>> +{
>> +ÂÂÂ struct lm3532_data *drvdata = i2c_get_clientdata(client);
> 
> mutex_destroy() is missing here.

Ack

> 
>> +ÂÂÂ if (drvdata->enable_gpio)
>> +ÂÂÂÂÂÂÂ gpiod_direction_output(drvdata->enable_gpio, 0);
>> +
>> +ÂÂÂ return 0;
>> +}
>> +
>> +static const struct of_device_id of_lm3532_leds_match[] = {
>> +ÂÂÂ { .compatible = "ti,lm3532", },
>> +ÂÂÂ {},
>> +};
>> +MODULE_DEVICE_TABLE(of, of_lm3532_leds_match);
>> +
>> +static const struct i2c_device_id lm3532_id[] = {
>> +ÂÂÂ {LM3532_NAME, 0},
>> +ÂÂÂ {}
>> +};
>> +MODULE_DEVICE_TABLE(i2c, lm3532_id);
>> +
>> +static struct i2c_driver lm3532_i2c_driver = {
>> +ÂÂÂ .probe = lm3532_probe,
>> +ÂÂÂ .remove = lm3532_remove,
>> +ÂÂÂ .id_table = lm3532_id,
>> +ÂÂÂ .driver = {
>> +ÂÂÂÂÂÂÂ .name = LM3532_NAME,
>> +ÂÂÂÂÂÂÂ .of_match_table = of_lm3532_leds_match,
>> +ÂÂÂ },
>> +};
>> +module_i2c_driver(lm3532_i2c_driver);
>> +
>> +MODULE_DESCRIPTION("Back Light driver for LM3532");
>> +MODULE_LICENSE("GPL v2");
>> +MODULE_AUTHOR("Dan Murphy <dmurphy@xxxxxx>");
>> diff --git a/include/dt-bindings/leds/leds-lm3532.h b/include/dt-bindings/leds/leds-lm3532.h
>> new file mode 100644
>> index 000000000000..724dbc0cb395
>> --- /dev/null
>> +++ b/include/dt-bindings/leds/leds-lm3532.h
> 
> This should go in a separate patch, with DT bindings - see checkpatch.pl
> complaint.
> 

I have removed this in v2 of the next patchset.

Dan

>> @@ -0,0 +1,72 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>> +/* TI LM3532 LED driver
>> + * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
>> + */
>> +
>> +#ifndef __DT_BINDINGS_LEDS_LM3532_H
>> +#define __DT_BINDINGS_LEDS_LM3532_H
>> +
>> +#define LM3532_BL_MODE_MANUALÂÂÂ 0x00 /* "man" */
>> +#define LM3532_BL_MODE_ALSÂÂÂ 0x01 /* "als" */
>> +
>> +/* ALS Resistor Select */
>> +#define LM3532_IMP_HIGHÂÂÂÂÂÂÂ 0x00
>> +#define LM3532_IMP_37KÂÂÂÂÂÂÂ 0x01
>> +#define LM3532_IMP_18_5KÂÂÂ 0x02
>> +#define LM3532_IMP_12_33KÂÂÂ 0x03
>> +#define LM3532_IMP_9_25KÂÂÂ 0x04
>> +#define LM3532_IMP_7_4KÂÂÂÂÂÂÂ 0x05
>> +#define LM3532_IMP_6_17KÂÂÂ 0x06
>> +#define LM3532_IMP_5_29KÂÂÂ 0x07
>> +#define LM3532_IMP_4_63KÂÂÂ 0x08
>> +#define LM3532_IMP_4_11KÂÂÂ 0x09
>> +#define LM3532_IMP_3_7KÂÂÂÂÂÂÂ 0x0a
>> +#define LM3532_IMP_3_36KÂÂÂ 0x0b
>> +#define LM3532_IMP_3_08KÂÂÂ 0x0c
>> +#define LM3532_IMP_2_85KÂÂÂ 0x0d
>> +#define LM3532_IMP_2_64KÂÂÂ 0x0e
>> +#define LM3532_IMP_2_44KÂÂÂ 0x0f
>> +#define LM3532_IMP_2_31KÂÂÂ 0x10
>> +#define LM3532_IMP_2_18KÂÂÂ 0x11
>> +#define LM3532_IMP_2_06KÂÂÂ 0x12
>> +#define LM3532_IMP_1_95KÂÂÂ 0x13
>> +#define LM3532_IMP_1_85KÂÂÂ 0x14
>> +#define LM3532_IMP_1_76KÂÂÂ 0x15
>> +#define LM3532_IMP_1_68KÂÂÂ 0x16
>> +#define LM3532_IMP_1_61KÂÂÂ 0x17
>> +#define LM3532_IMP_1_54KÂÂÂ 0x18
>> +#define LM3532_IMP_1_48KÂÂÂ 0x19
>> +#define LM3532_IMP_1_42KÂÂÂ 0x1a
>> +#define LM3532_IMP_1_37KÂÂÂ 0x1b
>> +#define LM3532_IMP_1_32KÂÂÂ 0x1c
>> +#define LM3532_IMP_1_28KÂÂÂ 0x1d
>> +#define LM3532_IMP_1_23KÂÂÂ 0x1e
>> +#define LM3532_IMP_1_19KÂÂÂ 0x1f
>> +
>> +/* ALS Averaging Time */
>> +#define LM3532_ALS_AVRG_TIME_17_92msÂÂÂ 0x00
>> +#define LM3532_ALS_AVRG_TIME_35_84msÂÂÂ 0x01
>> +#define LM3532_ALS_AVRG_TIME_71_68msÂÂÂ 0x02
>> +#define LM3532_ALS_AVRG_TIME_143_36msÂÂÂ 0x03
>> +#define LM3532_ALS_AVRG_TIME_286_72msÂÂÂ 0x04
>> +#define LM3532_ALS_AVRG_TIME_573_44msÂÂÂ 0x05
>> +#define LM3532_ALS_AVRG_TIME_1146_88msÂÂÂ 0x06
>> +#define LM3532_ALS_AVRG_TIME_2293_76msÂÂÂ 0x07
>> +
>> +/* ALS input select */
>> +#define LM3532_ALS_INPUT_AVRGÂÂÂ 0x00 /* ALS1 and ALS2 input average */
>> +#define LM3532_ALS_INPUT_ALS1ÂÂÂ 0x01 /* ALS1 Input */
>> +#define LM3532_ALS_INPUT_ALS2ÂÂÂ 0x02 /* ALS2 Input */
>> +#define LM3532_ALS_INPUT_CEILÂÂÂ 0x03 /* Max of ALS1 and ALS2 */
>> +
>> +/* Ramp Times */
>> +#define LM3532_RAMP_8usÂÂÂÂÂÂÂ 0x00
>> +#define LM3532_RAMP_1024usÂÂÂ 0x01
>> +#define LM3532_RAMP_2048usÂÂÂ 0x02
>> +#define LM3532_RAMP_4096usÂÂÂ 0x03
>> +#define LM3532_RAMP_8192usÂÂÂ 0x04
>> +#define LM3532_RAMP_16384usÂÂÂ 0x05
>> +#define LM3532_RAMP_32768usÂÂÂ 0x06
>> +#define LM3532_RAMP_65536usÂÂÂ 0x07
>> +
>> +#endif /* __DT_BINDINGS_LEDS_LM3532_H */
>>
> 


-- 
------------------
Dan Murphy