Support for isl76683 ambient light sensor
Subsystems (2)
cover Support for isl76683 ambient light sensor
This patchstack adds initial support for isl76683 light sensor.
Christoph Fritz (2):
iio: light: Add support for Intersil isl76683 sensor
dt-bindings: iio: light: add isl76683 light bindings
.../bindings/iio/light/isil,isl76683.yaml | 48 ++ drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/isl76683.c | 604 ++++++++++++++++++ 4 files changed, 665 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/light/isil,isl76683.yaml create mode 100644 drivers/iio/light/isl76683.c
Signature · 1 line
2.29.2
PATCH 1/2 iio: light: Add support for Intersil isl76683 sensor
This patch adds support for Intersil isl76683 light sensor.
--- drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/isl76683.c | 604 +++++++++++++++++++++++++++++++++++ 3 files changed, 617 insertions(+) create mode 100644 drivers/iio/light/isl76683.c
drivers/iio/light/Kconfig +12 -0
@@ -253,6 +253,18 @@ config ISL29125 To compile this driver as a module, choose M here: the module will be called isl29125. +config ISL76683 + tristate "Intersil ISL76683 light sensor" + depends on I2C + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + help + Say Y here if you want to build a driver for the Intersil ISL76683 + light sensor for I2C. + + To compile this driver as a module, choose M here: the module will be + called isl76683. + config HID_SENSOR_ALS depends on HID_SENSOR_HUB select IIO_BUFFER
drivers/iio/light/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_IQS621_ALS) += iqs621-als.o obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o obj-$(CONFIG_ISL29125) += isl29125.o +obj-$(CONFIG_ISL76683) += isl76683.o obj-$(CONFIG_JSA1212) += jsa1212.o obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o obj-$(CONFIG_LTR501) += ltr501.o
drivers/iio/light/isl76683.c new file +604 -0
604 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 1/2] iio: light: Add support for Intersil isl76683 sensor
Quoted 2 lines
This patch adds support for Intersil isl76683 light sensor.
nice, minor comments below
Quoted 167 lines
Signed-off-by Christoph Fritz <[email protected]>--- drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/isl76683.c | 604 +++++++++++++++++++++++++++++++++++ 3 files changed, 617 insertions(+) create mode 100644 drivers/iio/light/isl76683.cdrivers/iio/light/Kconfig +12
-0@@ -253,6 +253,18 @@ config ISL29125 To compile this driver as a module, choose M here: the module will be called isl29125. +config ISL76683 + tristate "Intersil ISL76683 light sensor" + depends on I2C + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + help + Say Y here if you want to build a driver for the Intersil ISL76683 + light sensor for I2C. + + To compile this driver as a module, choose M here: the module will be + called isl76683. + config HID_SENSOR_ALS depends on HID_SENSOR_HUB select IIO_BUFFERdrivers/iio/light/Makefile +1
-0@@ -28,6 +28,7 @@ obj-$(CONFIG_IQS621_ALS) += iqs621-als.o obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o obj-$(CONFIG_ISL29125) += isl29125.o +obj-$(CONFIG_ISL76683) += isl76683.o obj-$(CONFIG_JSA1212) += jsa1212.o obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o obj-$(CONFIG_LTR501) += ltr501.odrivers/iio/light/isl76683.c new file +118
-0@@ -0,0 +1,604 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include <linux/module.h> +#include <linux/i2c.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/util_macros.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/buffer.h> +#include <linux/iio/trigger.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> + +#define ISL76683_REG_CMD 0x00 +#define ISL76683_REG_CTRL 0x01 +#define ISL76683_REG_THR_HI 0x02 +#define ISL76683_REG_THR_LO 0x03 +#define ISL76683_REG_SENSOR_LSB 0x04 +#define ISL76683_REG_SENSOR_MSB 0x05 +#define ISL76683_REG_CLEAR_INT 0x40 +#define ISL76683_REGMAP_MAX 0x40 + +#define ISL76683_CMD_ENABLE BIT(7) +#define ISL76683_CMD_PWRDWN BIT(6) +#define ISL76683_PHOTOD_SHFT 2 +#define ISL76683_PHOTOD_MASK GENMASK(3, ISL76683_PHOTOD_SHFT) +#define ISL76683_INTPERS_MASK 0x3 +#define ISL76683_LUXRANGE_SHFT 2 +#define ISL76683_LUXRANGE_MASK (0x3 << ISL76683_LUXRANGE_SHFT) +#define ISL76683_LUXRANGE_STR "1000 4000 16000 64000" +#define ISL76683_RESOLUTION_SHFT 0 +#define ISL76683_RESOLUTION_MASK (0x3 << ISL76683_RESOLUTION_SHFT) + +enum isl76683_dmode { +ISL76683_DIODE_0 =0 , +ISL76683_DIODE_IR , +ISL76683_DIODE_DIFF , +}; + +enum isl76683_lux_range { +ISL76683_LUX_1000 =0 , +ISL76683_LUX_4000 , +ISL76683_LUX_16000 , +ISL76683_LUX_64000 , +}; + +enum isl76683_resolution { +ISL76683_RES_16 =0 , +ISL76683_RES_12 , +ISL76683_RES_8 , +ISL76683_RES_4 , +}; + +static const int isl76683_lux_ranges_available[] = { +1000 ,4000 ,16000 ,64000 }; + +#define ISL76683_LUX_RANGE_DEFAULT ISL76683_LUX_1000 +#define ISL76683_DIODE_DEFAULT ISL76683_DIODE_0 +#define ISL76683_RESOLUTION_DEFAULT ISL76683_RES_16 +#define ISL76683_INTPERS_DEFAULT 0x0 +#define ISL76683_THR_DEFAULT 0x7f + +struct isl76683_chip { +enum isl76683_lux_range luxrange; +enum isl76683_dmode photodiode; +struct i2c_client *client; +struct regmap *rmp; +struct completion irq_complete; +struct iio_trigger *trig; +bool trig_enabled; +struct mutex lock; +s64 time_ns; +}; + +static bool isl76683_readable_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case ISL76683_REG_CMD : +case ISL76683_REG_CTRL : +case ISL76683_REG_THR_HI : +case ISL76683_REG_THR_LO : +case ISL76683_REG_SENSOR_LSB : +case ISL76683_REG_SENSOR_MSB : +case ISL76683_REG_CLEAR_INT : +return true; +default : +return false; + } +} + +static bool isl76683_writeable_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case ISL76683_REG_CMD : +case ISL76683_REG_CTRL : +case ISL76683_REG_THR_HI : +case ISL76683_REG_THR_LO : +return true; +default : +return false; + } +} + +static bool isl76683_is_volatile_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case ISL76683_REG_SENSOR_LSB : +case ISL76683_REG_SENSOR_MSB : +case ISL76683_REG_CLEAR_INT : +return true; +default : +return false; + } +} + +static const struct regmap_config isl76683_regmap_config = { + .reg_bits =8 , + .val_bits =8 ,
drivers/iio/light/isl76683.c line 128
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+ .max_register = ISL76683_REGMAP_MAX, + .readable_reg = isl76683_readable_reg, + .writeable_reg = isl76683_writeable_reg, + .volatile_reg = isl76683_is_volatile_reg, + .cache_type = REGCACHE_RBTREE, +}; + +static int isl76683_get_sensordata (struct isl76683_chip *chip,int *val) +{ +unsigned int sensor_data;
variable not needed, directly assign to *val?
Quoted 6 lines
drivers/iio/light/isl76683.c new file +6
-0+__le16 sensor_raw; +int ret; + + ret =regmap_bulk_read (chip->rmp,ISL76683_REG_SENSOR_LSB , + &sensor_raw,sizeof (sensor_raw)); +if (ret)
drivers/iio/light/isl76683.c line 144
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+return ret; + + sensor_data =le16_to_cpu (sensor_raw); + + *val = sensor_data; + +return 0 ; +} + +static inline int isl76683_start_measurement (struct isl76683_chip *chip)
that's the only inline function, probably not need to mark explicitly
Quoted 28 lines
drivers/iio/light/isl76683.c new file +28
-0+{ +int dummy; + +/* dummy read is clearing irq and triggers new measurement */ +return regmap_read (chip->rmp,ISL76683_REG_CLEAR_INT , &dummy); +} + +static int isl76683_singleshot_conversion (struct isl76683_chip *chip,int *val) +{ +long timeout; +int ret; + + ret =isl76683_start_measurement (chip); +if (ret <0 ) +return ret; + +/* wait for measurement to complete */ + timeout =wait_for_completion_interruptible_timeout ( + &chip->irq_complete, +msecs_to_jiffies (5000 )); +if (timeout ==0 ) { +dev_err (&chip->client->dev,"measurement timed out\n" ); +return -ETIMEDOUT ; + }else if (timeout <0 ) { +dev_err (&chip->client->dev,"wait for measurement failed\n" ); +return -EINTR ; + } +
drivers/iio/light/isl76683.c line 182
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+ ret =isl76683_get_sensordata (chip, val); +if (ret) { +dev_err (&chip->client->dev,"%s: Error %d reading lux\n" , + __func__, ret); +return ret; + } + +return IIO_VAL_INT ; +} +
avoid double newline
drivers/iio/light/isl76683.c line 186
Quoted 4 lines
drivers/iio/light/isl76683.c new file +4
-0+ +static int isl76683_set_config (struct isl76683_chip *chip) +{ +int dummy, ret;
dummy could be in local scope below
Quoted 117 lines
drivers/iio/light/isl76683.c new file +117
-0+bool changed; + + ret =regmap_update_bits (chip->rmp,ISL76683_REG_CTRL , +ISL76683_LUXRANGE_MASK |ISL76683_INTPERS_MASK , + (chip->luxrange <<ISL76683_LUXRANGE_SHFT ) | +ISL76683_INTPERS_DEFAULT ); +if (ret <0 ) +return ret; + + ret =regmap_update_bits_check (chip->rmp,ISL76683_REG_CMD , +ISL76683_PHOTOD_MASK |ISL76683_RESOLUTION_MASK , + (chip->photodiode <<ISL76683_PHOTOD_SHFT ) | +ISL76683_RESOLUTION_DEFAULT , &changed); +if (ret <0 ) +return ret; + +/* to get sane result after changing diode, dummy read is necessary */ +if (changed) { + ret =isl76683_singleshot_conversion (chip, &dummy); +if (ret <0 ) +return ret; + } + + ret =regmap_write (chip->rmp,ISL76683_REG_THR_HI , +ISL76683_THR_DEFAULT ); +if (ret <0 ) +return ret; + +return regmap_write (chip->rmp,ISL76683_REG_THR_LO , +ISL76683_THR_DEFAULT ); +} + +static int isl76683_power (struct isl76683_chip *chip,bool on) +{ +int ret; + + ret =regmap_update_bits (chip->rmp,ISL76683_REG_CMD , +ISL76683_CMD_ENABLE |ISL76683_CMD_PWRDWN , +0x0 ); +if (ret <0 ) +return ret; + + ret =regmap_update_bits (chip->rmp,ISL76683_REG_CMD , +ISL76683_CMD_ENABLE |ISL76683_CMD_PWRDWN , + on ?ISL76683_CMD_ENABLE :ISL76683_CMD_PWRDWN ); +if (ret <0 ) +return ret; + +return on ?isl76683_set_config (chip) :0 ; +} + +static void isl76683_power_disable (void *data) +{ +struct isl76683_chip *chip = data; + +isl76683_power (chip, false); +} + +static int isl76683_reset (struct isl76683_chip *chip) +{ +int ret; + + ret =isl76683_power (chip, false); +if (ret <0 ) +return ret; + +return isl76683_power (chip, true); +} + +static irqreturn_t isl76683_interrupt_handler (int irq,void *private) +{ +struct iio_dev *indio_dev = private; +struct isl76683_chip *chip =iio_priv (indio_dev); + + chip->time_ns =iio_get_time_ns (indio_dev); + +if (chip->trig_enabled) +iio_trigger_poll (chip->trig); + +if (!completion_done (&chip->irq_complete)) +complete (&chip->irq_complete); + +return IRQ_HANDLED ; +} + +static irqreturn_t isl76683_trigger_handler (int irq,void *p) +{ +struct iio_poll_func *pf = p; +struct iio_dev *indio_dev = pf->indio_dev; +struct isl76683_chip *chip =iio_priv (indio_dev); +struct { +__le16 sensor; +s64 ts__aligned(8) ; + } scan; +int ret; + +mutex_lock (&chip->lock); + ret =regmap_bulk_read (chip->rmp,ISL76683_REG_SENSOR_LSB , + (u8 *)&scan.sensor,sizeof (scan.sensor)); +if (ret) + goto done; + +iio_push_to_buffers_with_timestamp (indio_dev, &scan, chip->time_ns); + + ret =isl76683_start_measurement (chip); +if (ret <0 ) + goto done; + +done: +mutex_unlock (&chip->lock); +iio_trigger_notify_done (indio_dev->trig); +return IRQ_HANDLED ; +} + +static int isl76683_buffer_preenable (struct iio_dev *indio_dev) +{ +struct isl76683_chip *chip =iio_priv (indio_dev);
drivers/iio/light/isl76683.c line 313
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+int ret; + +if (test_bit (2 , indio_dev->active_scan_mask)) + chip->photodiode =ISL76683_DIODE_DIFF ; +else if (test_bit (1 , indio_dev->active_scan_mask)) + chip->photodiode =ISL76683_DIODE_IR ; +else + chip->photodiode =ISL76683_DIODE_0 ; + + ret =isl76683_set_config (chip);
just
return isl76683_set_config(chip);
no need for ret
Quoted 27 lines
drivers/iio/light/isl76683.c new file +27
-0+ +return ret; +} + +static const struct iio_buffer_setup_ops isl76683_buffer_setup_ops = { + .preenable = &isl76683_buffer_preenable, + .validate_scan_mask = &iio_validate_scan_mask_onehot, +}; + +static int isl76683_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct isl76683_chip *chip =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_RAW : + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; +switch (chan->channel2) { +case IIO_MOD_LIGHT_BOTH : + chip->photodiode =ISL76683_DIODE_DIFF ; +break ; +case IIO_MOD_LIGHT_IR : + chip->photodiode =ISL76683_DIODE_IR ;
drivers/iio/light/isl76683.c line 350
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+break ; +default : + chip->photodiode =ISL76683_DIODE_0 ; + } + ret =isl76683_set_config (chip); +if (ret) { +iio_device_release_direct_mode (indio_dev); +return ret; + } + ret =isl76683_singleshot_conversion (chip, val);
shouldn't this be mutex to not interfere with config changes?
Quoted 255 lines
drivers/iio/light/isl76683.c new file +254
-0+iio_device_release_direct_mode (indio_dev); +return ret; +case IIO_CHAN_INFO_SCALE : + *val = isl76683_lux_ranges_available[chip->luxrange]; +return IIO_VAL_INT ; + } + +return -EINVAL ; +} + +static int isl76683_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct isl76683_chip *chip =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SCALE : +mutex_lock (&chip->lock); + chip->luxrange =find_closest (val, + isl76683_lux_ranges_available, +ARRAY_SIZE (isl76683_lux_ranges_available)); + ret =isl76683_set_config (chip); +mutex_unlock (&chip->lock); +return ret; + } + +return -EINVAL ; +} + +static IIO_CONST_ATTR(in_illuminance_scale_available, + ISL76683_LUXRANGE_STR); + +static struct attribute *isl76683_attributes[] = { + &iio_const_attr_in_illuminance_scale_available.dev_attr.attr, +NULL +}; + +static const struct attribute_group isl76683_attribute_group = { + .attrs = isl76683_attributes, +}; + +#define ISL76683_CHANNEL (_ch2, _si) { \ + .type = IIO_LIGHT, \ + .modified = 1, \ + .channel2 = _ch2, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .scan_index = _si, \ + .scan_type = { \ + .sign = 'u', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_LE, \ + }, \ +} + +static const struct iio_chan_spec isl76683_channels[] = { + { + .type =IIO_LIGHT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ), + .scan_index =0 , + .scan_type = { + .sign ='u' , + .realbits =16 , + .storagebits =16 , + .endianness =IIO_LE , + }, + }, +ISL76683_CHANNEL (IIO_MOD_LIGHT_IR ,1 ), +ISL76683_CHANNEL (IIO_MOD_LIGHT_BOTH ,2 ), +IIO_CHAN_SOFT_TIMESTAMP (3 ), +}; + +static const struct iio_info isl76683_info = { + .read_raw = isl76683_read_raw, + .write_raw = isl76683_write_raw, + .attrs = &isl76683_attribute_group, +}; + +static int isl76683_set_trigger_state (struct iio_trigger *trig,bool enable) +{ +struct isl76683_chip *chip =iio_trigger_get_drvdata (trig); +int ret; + +if (enable) { + chip->trig_enabled = true; + ret =isl76683_start_measurement (chip); +if (ret <0 ) +return ret; + }else + chip->trig_enabled = false; + +return 0 ; +} + +static const struct iio_trigger_ops isl76683_trigger_ops = { + .set_trigger_state = isl76683_set_trigger_state, + .validate_device = iio_trigger_validate_own_device, +}; + +static int isl76683_probe (struct i2c_client *client) +{ +struct device *dev = &client->dev; +struct isl76683_chip *chip; +struct iio_dev *indio_dev; +int v, ret; + + indio_dev =devm_iio_device_alloc (dev,sizeof (*chip)); +if (!indio_dev) +return -ENOMEM ; + + chip =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + chip->client = client; + + chip->luxrange =ISL76683_LUX_RANGE_DEFAULT ; + chip->photodiode =ISL76683_DIODE_DEFAULT ; + + chip->rmp =devm_regmap_init_i2c (client, &isl76683_regmap_config); +if (IS_ERR (chip->rmp)) { + ret =PTR_ERR (chip->rmp); +dev_err (dev,"%s: Error %d initializing regmap\n" , + __func__, ret); +return ret; + } + +mutex_init (&chip->lock); +init_completion (&chip->irq_complete); + +if (!client->irq) { +dev_err (dev,"no interrupt configured\n" ); +return -EINVAL ; + } + + indio_dev->dev.parent = dev; + indio_dev->info = &isl76683_info; + indio_dev->channels = isl76683_channels; + indio_dev->num_channels =ARRAY_SIZE (isl76683_channels); + indio_dev->name = chip->client->name; + indio_dev->modes =INDIO_DIRECT_MODE ; + + chip->trig_enabled = false; + chip->trig =devm_iio_trigger_alloc (dev,"%s-dev%d" , + indio_dev->name, indio_dev->id); +if (!chip->trig) +return -ENOMEM ; + + chip->trig->ops = &isl76683_trigger_ops; + chip->trig->dev.parent = dev; +iio_trigger_set_drvdata (chip->trig, chip); + + ret =devm_request_irq (dev, client->irq, + isl76683_interrupt_handler, +IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"isl76683_event" , indio_dev); +if (ret) { +dev_err (dev,"irq request error\n" ); +return ret; + } + + ret =devm_iio_trigger_register (dev, chip->trig); +if (ret) { +dev_err (dev,"iio_trigger register error\n" ); +return ret; + } + + ret =isl76683_reset (chip); +if (ret) { +dev_err (dev,"reset failed\n" ); +return ret; + } + + ret =isl76683_get_sensordata (chip, &v); +if (ret) { +dev_err (dev,"initial dummy readout failed\n" ); +return ret; + } + + ret =devm_add_action_or_reset (dev, isl76683_power_disable, chip); +if (ret) +return ret; + + ret =devm_iio_triggered_buffer_setup (dev, indio_dev,NULL , + &isl76683_trigger_handler, &isl76683_buffer_setup_ops); +if (ret) +return ret; + + ret =devm_iio_device_register (dev, indio_dev); +if (ret) { +dev_err (dev,"%s(): iio registration failed with error %d\n" , + __func__, ret); + } + +return ret; +} + +static int __maybe_unused isl76683_suspend (struct device *dev) +{ +struct isl76683_chip *chip = +iio_priv (i2c_get_clientdata (to_i2c_client (dev))); +int ret; + +mutex_lock (&chip->lock); + ret =isl76683_power (chip, false); +regcache_mark_dirty (chip->rmp); +mutex_unlock (&chip->lock); + +return ret; +} + +static int __maybe_unused isl76683_resume (struct device *dev) +{ +struct isl76683_chip *chip = +iio_priv (i2c_get_clientdata (to_i2c_client (dev))); +int ret; + +mutex_lock (&chip->lock); + ret =isl76683_power (chip, true); +mutex_unlock (&chip->lock); + +return ret; +} + +static SIMPLE_DEV_PM_OPS(isl76683_pm_ops, isl76683_suspend, isl76683_resume); + +static const struct of_device_id isl76683_of_match[] = { + { .compatible ="isil,isl76683" , }, + { } +}; +MODULE_DEVICE_TABLE (of, isl76683_of_match); + +static const struct i2c_device_id isl76683_id[] = { + {"isl76683" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, isl76683_id); + +static struct i2c_driver isl76683_driver = { + .driver = { + .name ="isl76683" , + .of_match_table = isl76683_of_match, + .pm = &isl76683_pm_ops, + }, + .probe_new = isl76683_probe, + .id_table = isl76683_id, +}; +module_i2c_driver (isl76683_driver); + +MODULE_AUTHOR ("Christoph Fritz <[email protected]>" ); +MODULE_DESCRIPTION ("ISL76683 Ambient Light Sensor driver" ); +MODULE_LICENSE ("GPL" );
Signature · 2 lines
Peter Meerwald-Stadler Mobile: +43 664 24 44 418
Re: [PATCH 1/2] iio: light: Add support for Intersil isl76683 sensor
Quoted 5 lines · On Wed, 2 Jun 2021 16:28:58 +0200 (CEST) Peter Meerwald-Stadler…
Quoted 1 line
This patch adds support for Intersil isl76683 light sensor.
nice, minor comments below
Quoted 1 line
Signed-off-by Christoph Fritz <[email protected]>
A few minor comments from me based on a quick look. I'll look closer at v2 given the detailed reviews you already have for v1.
Thanks,
Jonathan
Quoted 111 lines
Quoted 111 lines
--- drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/isl76683.c | 604 +++++++++++++++++++++++++++++++++++ 3 files changed, 617 insertions(+) create mode 100644 drivers/iio/light/isl76683.cdrivers/iio/light/Kconfig +12
-0@@ -253,6 +253,18 @@ config ISL29125 To compile this driver as a module, choose M here: the module will be called isl29125. +config ISL76683 + tristate "Intersil ISL76683 light sensor" + depends on I2C + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + help + Say Y here if you want to build a driver for the Intersil ISL76683 + light sensor for I2C. + + To compile this driver as a module, choose M here: the module will be + called isl76683. + config HID_SENSOR_ALS depends on HID_SENSOR_HUB select IIO_BUFFERdrivers/iio/light/Makefile +1
-0@@ -28,6 +28,7 @@ obj-$(CONFIG_IQS621_ALS) += iqs621-als.o obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o obj-$(CONFIG_ISL29125) += isl29125.o +obj-$(CONFIG_ISL76683) += isl76683.o obj-$(CONFIG_JSA1212) += jsa1212.o obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o obj-$(CONFIG_LTR501) += ltr501.odrivers/iio/light/isl76683.c new file +63
-0@@ -0,0 +1,604 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include <linux/module.h> +#include <linux/i2c.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/util_macros.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/buffer.h> +#include <linux/iio/trigger.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> + +#define ISL76683_REG_CMD 0x00 +#define ISL76683_REG_CTRL 0x01 +#define ISL76683_REG_THR_HI 0x02 +#define ISL76683_REG_THR_LO 0x03 +#define ISL76683_REG_SENSOR_LSB 0x04 +#define ISL76683_REG_SENSOR_MSB 0x05 +#define ISL76683_REG_CLEAR_INT 0x40 +#define ISL76683_REGMAP_MAX 0x40 + +#define ISL76683_CMD_ENABLE BIT(7) +#define ISL76683_CMD_PWRDWN BIT(6) +#define ISL76683_PHOTOD_SHFT 2 +#define ISL76683_PHOTOD_MASK GENMASK(3, ISL76683_PHOTOD_SHFT) +#define ISL76683_INTPERS_MASK 0x3 +#define ISL76683_LUXRANGE_SHFT 2 +#define ISL76683_LUXRANGE_MASK (0x3 << ISL76683_LUXRANGE_SHFT) +#define ISL76683_LUXRANGE_STR "1000 4000 16000 64000" +#define ISL76683_RESOLUTION_SHFT 0 +#define ISL76683_RESOLUTION_MASK (0x3 << ISL76683_RESOLUTION_SHFT) + +enum isl76683_dmode { +ISL76683_DIODE_0 =0 , +ISL76683_DIODE_IR , +ISL76683_DIODE_DIFF , +}; + +enum isl76683_lux_range { +ISL76683_LUX_1000 =0 , +ISL76683_LUX_4000 , +ISL76683_LUX_16000 , +ISL76683_LUX_64000 , +}; + +enum isl76683_resolution { +ISL76683_RES_16 =0 , +ISL76683_RES_12 , +ISL76683_RES_8 , +ISL76683_RES_4 , +}; + +static const int isl76683_lux_ranges_available[] = { +1000 ,4000 ,16000 ,64000 }; + +#define ISL76683_LUX_RANGE_DEFAULT ISL76683_LUX_1000 +#define ISL76683_DIODE_DEFAULT ISL76683_DIODE_0 +#define ISL76683_RESOLUTION_DEFAULT ISL76683_RES_16 +#define ISL76683_INTPERS_DEFAULT 0x0 +#define ISL76683_THR_DEFAULT 0x7f + +struct isl76683_chip {
Quoted 8 lines
drivers/iio/light/isl76683.c line 71
Quoted 8 lines
drivers/iio/light/isl76683.c new file +8
-0+enum isl76683_lux_range luxrange; +enum isl76683_dmode photodiode; +struct i2c_client *client; +struct regmap *rmp; +struct completion irq_complete; +struct iio_trigger *trig; +bool trig_enabled; +struct mutex lock;
Locks should always have documentation for their scope.
Quoted 158 lines
Quoted 47 lines
drivers/iio/light/isl76683.c new file +47
-0+s64 time_ns; +}; + +static bool isl76683_readable_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case ISL76683_REG_CMD : +case ISL76683_REG_CTRL : +case ISL76683_REG_THR_HI : +case ISL76683_REG_THR_LO : +case ISL76683_REG_SENSOR_LSB : +case ISL76683_REG_SENSOR_MSB : +case ISL76683_REG_CLEAR_INT : +return true; +default : +return false; + } +} + +static bool isl76683_writeable_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case ISL76683_REG_CMD : +case ISL76683_REG_CTRL : +case ISL76683_REG_THR_HI : +case ISL76683_REG_THR_LO : +return true; +default : +return false; + } +} + +static bool isl76683_is_volatile_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case ISL76683_REG_SENSOR_LSB : +case ISL76683_REG_SENSOR_MSB : +case ISL76683_REG_CLEAR_INT : +return true; +default : +return false; + } +} + +static const struct regmap_config isl76683_regmap_config = { + .reg_bits =8 , + .val_bits =8 ,drivers/iio/light/isl76683.c line 128
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+ .max_register = ISL76683_REGMAP_MAX, + .readable_reg = isl76683_readable_reg, + .writeable_reg = isl76683_writeable_reg, + .volatile_reg = isl76683_is_volatile_reg, + .cache_type = REGCACHE_RBTREE, +}; + +static int isl76683_get_sensordata (struct isl76683_chip *chip,int *val) +{ +unsigned int sensor_data;variable not needed, directly assign to *val?
Quoted 6 lines
drivers/iio/light/isl76683.c new file +6
-0+__le16 sensor_raw; +int ret; + + ret =regmap_bulk_read (chip->rmp,ISL76683_REG_SENSOR_LSB , + &sensor_raw,sizeof (sensor_raw)); +if (ret)drivers/iio/light/isl76683.c line 144
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+return ret; + + sensor_data =le16_to_cpu (sensor_raw); + + *val = sensor_data; + +return 0 ; +} + +static inline int isl76683_start_measurement (struct isl76683_chip *chip)that's the only inline function, probably not need to mark explicitly
Quoted 28 lines
drivers/iio/light/isl76683.c new file +28
-0+{ +int dummy; + +/* dummy read is clearing irq and triggers new measurement */ +return regmap_read (chip->rmp,ISL76683_REG_CLEAR_INT , &dummy); +} + +static int isl76683_singleshot_conversion (struct isl76683_chip *chip,int *val) +{ +long timeout; +int ret; + + ret =isl76683_start_measurement (chip); +if (ret <0 ) +return ret; + +/* wait for measurement to complete */ + timeout =wait_for_completion_interruptible_timeout ( + &chip->irq_complete, +msecs_to_jiffies (5000 )); +if (timeout ==0 ) { +dev_err (&chip->client->dev,"measurement timed out\n" ); +return -ETIMEDOUT ; + }else if (timeout <0 ) { +dev_err (&chip->client->dev,"wait for measurement failed\n" ); +return -EINTR ; + } +drivers/iio/light/isl76683.c line 182
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+ ret =isl76683_get_sensordata (chip, val); +if (ret) { +dev_err (&chip->client->dev,"%s: Error %d reading lux\n" , + __func__, ret); +return ret; + } + +return IIO_VAL_INT ; +} +avoid double newline
drivers/iio/light/isl76683.c line 186
Quoted 4 lines
drivers/iio/light/isl76683.c new file +4
-0+ +static int isl76683_set_config (struct isl76683_chip *chip) +{ +int dummy, ret;dummy could be in local scope below
Quoted 31 lines
drivers/iio/light/isl76683.c new file +31
-0+bool changed; + + ret =regmap_update_bits (chip->rmp,ISL76683_REG_CTRL , +ISL76683_LUXRANGE_MASK |ISL76683_INTPERS_MASK , + (chip->luxrange <<ISL76683_LUXRANGE_SHFT ) | +ISL76683_INTPERS_DEFAULT ); +if (ret <0 ) +return ret; + + ret =regmap_update_bits_check (chip->rmp,ISL76683_REG_CMD , +ISL76683_PHOTOD_MASK |ISL76683_RESOLUTION_MASK , + (chip->photodiode <<ISL76683_PHOTOD_SHFT ) | +ISL76683_RESOLUTION_DEFAULT , &changed); +if (ret <0 ) +return ret; + +/* to get sane result after changing diode, dummy read is necessary */ +if (changed) { + ret =isl76683_singleshot_conversion (chip, &dummy); +if (ret <0 ) +return ret; + } + + ret =regmap_write (chip->rmp,ISL76683_REG_THR_HI , +ISL76683_THR_DEFAULT ); +if (ret <0 ) +return ret; + +return regmap_write (chip->rmp,ISL76683_REG_THR_LO , +ISL76683_THR_DEFAULT ); +}
Quoted 8 lines
drivers/iio/light/isl76683.c line 225
Quoted 8 lines
drivers/iio/light/isl76683.c new file +8
-0+ +static int isl76683_power (struct isl76683_chip *chip,bool on) +{ +int ret; + + ret =regmap_update_bits (chip->rmp,ISL76683_REG_CMD , +ISL76683_CMD_ENABLE |ISL76683_CMD_PWRDWN , +0x0 );
This is odd enough that I'd like to see some comments on why we are first writing these to 0 and then writing them to something else. What does the intermediate state mean for device functionality?
Quoted 52 lines
Quoted 52 lines
drivers/iio/light/isl76683.c new file +52
-0+if (ret <0 ) +return ret; + + ret =regmap_update_bits (chip->rmp,ISL76683_REG_CMD , +ISL76683_CMD_ENABLE |ISL76683_CMD_PWRDWN , + on ?ISL76683_CMD_ENABLE :ISL76683_CMD_PWRDWN ); +if (ret <0 ) +return ret; + +return on ?isl76683_set_config (chip) :0 ; +} + +static void isl76683_power_disable (void *data) +{ +struct isl76683_chip *chip = data; + +isl76683_power (chip, false); +} + +static int isl76683_reset (struct isl76683_chip *chip) +{ +int ret; + + ret =isl76683_power (chip, false); +if (ret <0 ) +return ret; + +return isl76683_power (chip, true); +} + +static irqreturn_t isl76683_interrupt_handler (int irq,void *private) +{ +struct iio_dev *indio_dev = private; +struct isl76683_chip *chip =iio_priv (indio_dev); + + chip->time_ns =iio_get_time_ns (indio_dev); + +if (chip->trig_enabled) +iio_trigger_poll (chip->trig); + +if (!completion_done (&chip->irq_complete)) +complete (&chip->irq_complete); + +return IRQ_HANDLED ; +} + +static irqreturn_t isl76683_trigger_handler (int irq,void *p) +{ +struct iio_poll_func *pf = p; +struct iio_dev *indio_dev = pf->indio_dev; +struct isl76683_chip *chip =iio_priv (indio_dev); +struct {
Quoted 8 lines
drivers/iio/light/isl76683.c line 285
Quoted 8 lines
drivers/iio/light/isl76683.c new file +8
-0+__le16 sensor; +s64 ts__aligned(8) ; + } scan; +int ret; + +mutex_lock (&chip->lock); + ret =regmap_bulk_read (chip->rmp,ISL76683_REG_SENSOR_LSB , + (u8 *)&scan.sensor,sizeof (scan.sensor));
No need for the u8 * cast.
Quoted 101 lines
Quoted 18 lines
drivers/iio/light/isl76683.c new file +18
-0+if (ret) + goto done; + +iio_push_to_buffers_with_timestamp (indio_dev, &scan, chip->time_ns); + + ret =isl76683_start_measurement (chip); +if (ret <0 ) + goto done; + +done: +mutex_unlock (&chip->lock); +iio_trigger_notify_done (indio_dev->trig); +return IRQ_HANDLED ; +} + +static int isl76683_buffer_preenable (struct iio_dev *indio_dev) +{ +struct isl76683_chip *chip =iio_priv (indio_dev);drivers/iio/light/isl76683.c line 313
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+int ret; + +if (test_bit (2 , indio_dev->active_scan_mask)) + chip->photodiode =ISL76683_DIODE_DIFF ; +else if (test_bit (1 , indio_dev->active_scan_mask)) + chip->photodiode =ISL76683_DIODE_IR ; +else + chip->photodiode =ISL76683_DIODE_0 ; + + ret =isl76683_set_config (chip);just
returnisl76683_set_config(chip);
no need for retQuoted 27 lines
drivers/iio/light/isl76683.c new file +27
-0+ +return ret; +} + +static const struct iio_buffer_setup_ops isl76683_buffer_setup_ops = { + .preenable = &isl76683_buffer_preenable, + .validate_scan_mask = &iio_validate_scan_mask_onehot, +}; + +static int isl76683_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct isl76683_chip *chip =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_RAW : + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; +switch (chan->channel2) { +case IIO_MOD_LIGHT_BOTH : + chip->photodiode =ISL76683_DIODE_DIFF ; +break ; +case IIO_MOD_LIGHT_IR : + chip->photodiode =ISL76683_DIODE_IR ;drivers/iio/light/isl76683.c line 350
Quoted 10 lines
drivers/iio/light/isl76683.c new file +10
-0+break ; +default : + chip->photodiode =ISL76683_DIODE_0 ; + } + ret =isl76683_set_config (chip); +if (ret) { +iio_device_release_direct_mode (indio_dev); +return ret; + } + ret =isl76683_singleshot_conversion (chip, val);shouldn't this be mutex to not interfere with config changes?
Quoted 28 lines
drivers/iio/light/isl76683.c new file +28
-0+iio_device_release_direct_mode (indio_dev); +return ret; +case IIO_CHAN_INFO_SCALE : + *val = isl76683_lux_ranges_available[chip->luxrange]; +return IIO_VAL_INT ; + } + +return -EINVAL ; +} + +static int isl76683_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct isl76683_chip *chip =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SCALE : +mutex_lock (&chip->lock); + chip->luxrange =find_closest (val, + isl76683_lux_ranges_available, +ARRAY_SIZE (isl76683_lux_ranges_available)); + ret =isl76683_set_config (chip); +mutex_unlock (&chip->lock); +return ret; + } +
Quoted 8 lines
drivers/iio/light/isl76683.c line 386
Quoted 8 lines
drivers/iio/light/isl76683.c new file +8
-0+return -EINVAL ; +} + +static IIO_CONST_ATTR(in_illuminance_scale_available, + ISL76683_LUXRANGE_STR); + +static struct attribute *isl76683_attributes[] = { + &iio_const_attr_in_illuminance_scale_available.dev_attr.attr,
For new drivers, I'd prefer to see the read_avail callbacks used and where possible no extra attributes.
Quoted 9 lines
drivers/iio/light/isl76683.c line 395
Quoted 9 lines
drivers/iio/light/isl76683.c new file +9
-0+NULL +}; + +static const struct attribute_group isl76683_attribute_group = { + .attrs = isl76683_attributes, +}; + +#define ISL76683_CHANNEL (_ch2, _si) { \ + .type = IIO_LIGHT, \
IIO_LIGHT channels are defined as having units of illuminance. That has no valid meaning for channels that aren't directly measuring with the right human eye matching frequency filtering.
Normally we therefore use IIO_INTENSITY for channels like these. Though the fun bit here is what is the SCALE?
That is normally not possible to specify, so I'd one expect to see it for the actual computed illuminance channel.
Quoted 102 lines
Quoted 102 lines
drivers/iio/light/isl76683.c new file +102
-0+ .modified = 1, \ + .channel2 = _ch2, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .scan_index = _si, \ + .scan_type = { \ + .sign = 'u', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_LE, \ + }, \ +} + +static const struct iio_chan_spec isl76683_channels[] = { + { + .type =IIO_LIGHT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ), + .scan_index =0 , + .scan_type = { + .sign ='u' , + .realbits =16 , + .storagebits =16 , + .endianness =IIO_LE , + }, + }, +ISL76683_CHANNEL (IIO_MOD_LIGHT_IR ,1 ), +ISL76683_CHANNEL (IIO_MOD_LIGHT_BOTH ,2 ), +IIO_CHAN_SOFT_TIMESTAMP (3 ), +}; + +static const struct iio_info isl76683_info = { + .read_raw = isl76683_read_raw, + .write_raw = isl76683_write_raw, + .attrs = &isl76683_attribute_group, +}; + +static int isl76683_set_trigger_state (struct iio_trigger *trig,bool enable) +{ +struct isl76683_chip *chip =iio_trigger_get_drvdata (trig); +int ret; + +if (enable) { + chip->trig_enabled = true; + ret =isl76683_start_measurement (chip); +if (ret <0 ) +return ret; + }else + chip->trig_enabled = false; + +return 0 ; +} + +static const struct iio_trigger_ops isl76683_trigger_ops = { + .set_trigger_state = isl76683_set_trigger_state, + .validate_device = iio_trigger_validate_own_device, +}; + +static int isl76683_probe (struct i2c_client *client) +{ +struct device *dev = &client->dev; +struct isl76683_chip *chip; +struct iio_dev *indio_dev; +int v, ret; + + indio_dev =devm_iio_device_alloc (dev,sizeof (*chip)); +if (!indio_dev) +return -ENOMEM ; + + chip =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + chip->client = client; + + chip->luxrange =ISL76683_LUX_RANGE_DEFAULT ; + chip->photodiode =ISL76683_DIODE_DEFAULT ; + + chip->rmp =devm_regmap_init_i2c (client, &isl76683_regmap_config); +if (IS_ERR (chip->rmp)) { + ret =PTR_ERR (chip->rmp); +dev_err (dev,"%s: Error %d initializing regmap\n" , + __func__, ret); +return ret; + } + +mutex_init (&chip->lock); +init_completion (&chip->irq_complete); + +if (!client->irq) { +dev_err (dev,"no interrupt configured\n" ); +return -EINVAL ; + } + + indio_dev->dev.parent = dev; + indio_dev->info = &isl76683_info; + indio_dev->channels = isl76683_channels; + indio_dev->num_channels =ARRAY_SIZE (isl76683_channels); + indio_dev->name = chip->client->name; + indio_dev->modes =INDIO_DIRECT_MODE ; + + chip->trig_enabled = false; + chip->trig =devm_iio_trigger_alloc (dev,"%s-dev%d" , + indio_dev->name, indio_dev->id);
Quoted 8 lines
drivers/iio/light/isl76683.c line 505
Quoted 8 lines
drivers/iio/light/isl76683.c new file +8
-0+if (!chip->trig) +return -ENOMEM ; + + chip->trig->ops = &isl76683_trigger_ops; + chip->trig->dev.parent = dev; +iio_trigger_set_drvdata (chip->trig, chip); + + ret = devm_request_irq(dev, client->irq,
People have an annoying habit of not writing the irq line up on devices
like this. Assuming the driver can usefully do sysfs channel reads
without the IRQ, it would be good to make it optional from the start (particularly as then the dt-binding can reflect that optionality)
In this case that might well mean a really pessimistic sleep for the non IRQ path.
Quoted 2 lines
drivers/iio/light/isl76683.c line 507
Quoted 2 lines
drivers/iio/light/isl76683.c new file +2
-0+ isl76683_interrupt_handler, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
The TRIGGER_FALLING bit should normally come from appropriate firmware rather than be driver enforced (though there is a lot of historical use of the pattern you have here that we can't safely clear out :(
Quoted 99 lines
Quoted 98 lines
drivers/iio/light/isl76683.c new file +97
-0+ "isl76683_event", indio_dev); +if (ret) { +dev_err (dev,"irq request error\n" ); +return ret; + } + + ret =devm_iio_trigger_register (dev, chip->trig); +if (ret) { +dev_err (dev,"iio_trigger register error\n" ); +return ret; + } + + ret =isl76683_reset (chip); +if (ret) { +dev_err (dev,"reset failed\n" ); +return ret; + } + + ret =isl76683_get_sensordata (chip, &v); +if (ret) { +dev_err (dev,"initial dummy readout failed\n" ); +return ret; + } + + ret =devm_add_action_or_reset (dev, isl76683_power_disable, chip); +if (ret) +return ret; + + ret =devm_iio_triggered_buffer_setup (dev, indio_dev,NULL , + &isl76683_trigger_handler, &isl76683_buffer_setup_ops); +if (ret) +return ret; + + ret =devm_iio_device_register (dev, indio_dev); +if (ret) { +dev_err (dev,"%s(): iio registration failed with error %d\n" , + __func__, ret); + } + +return ret; +} + +static int __maybe_unused isl76683_suspend (struct device *dev) +{ +struct isl76683_chip *chip = +iio_priv (i2c_get_clientdata (to_i2c_client (dev))); +int ret; + +mutex_lock (&chip->lock); + ret =isl76683_power (chip, false); +regcache_mark_dirty (chip->rmp); +mutex_unlock (&chip->lock); + +return ret; +} + +static int __maybe_unused isl76683_resume (struct device *dev) +{ +struct isl76683_chip *chip = +iio_priv (i2c_get_clientdata (to_i2c_client (dev))); +int ret; + +mutex_lock (&chip->lock); + ret =isl76683_power (chip, true); +mutex_unlock (&chip->lock); + +return ret; +} + +static SIMPLE_DEV_PM_OPS(isl76683_pm_ops, isl76683_suspend, isl76683_resume); + +static const struct of_device_id isl76683_of_match[] = { + { .compatible ="isil,isl76683" , }, + { } +}; +MODULE_DEVICE_TABLE (of, isl76683_of_match); + +static const struct i2c_device_id isl76683_id[] = { + {"isl76683" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, isl76683_id); + +static struct i2c_driver isl76683_driver = { + .driver = { + .name ="isl76683" , + .of_match_table = isl76683_of_match, + .pm = &isl76683_pm_ops, + }, + .probe_new = isl76683_probe, + .id_table = isl76683_id, +}; +module_i2c_driver (isl76683_driver); + +MODULE_AUTHOR ("Christoph Fritz <[email protected]>" ); +MODULE_DESCRIPTION ("ISL76683 Ambient Light Sensor driver" ); +MODULE_LICENSE ("GPL" );
Re: [PATCH 1/2] iio: light: Add support for Intersil isl76683 sensor
In reply to Christoph FritzQuoted 2 lines · Christoph Fritz
This patch adds support for Intersil isl76683 light sensor.
Any Datasheet link? (If it's one there, add it here as Datasheet: tag)
...
Missed bits.h
Quoted 1 line
+#include <
linux/module.h>
Missed mod_devicetable.h
drivers/iio/light/isl76683.c line 6
Quoted 4 lines
drivers/iio/light/isl76683.c new file +4
-0+#include <linux/i2c.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/util_macros.h>
+ blank line
Ordered alphabetically?
drivers/iio/light/isl76683.c line 12
Quoted 6 lines
drivers/iio/light/isl76683.c new file +6
-0+#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/buffer.h> +#include <linux/iio/trigger.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h>
Ditto.
...
Quoted 1 line
+#define
ISL76683_INTPERS_MASK0x3
GENMASK()
...
Quoted 1 line
+#define
ISL76683_LUXRANGE_MASK(0x3<<ISL76683_LUXRANGE_SHFT)
GENMASK() with direct numbers, please. No need to reuse those shifts here.
...
Quoted 1 line
+#define
ISL76683_RESOLUTION_MASK(0x3<<ISL76683_RESOLUTION_SHFT)
Ditto.
...
drivers/iio/light/isl76683.c line 35
Quoted 3 lines
drivers/iio/light/isl76683.c new file +2
-0+enum isl76683_dmode { +ISL76683_DIODE_0 =0 ,
0 is default by C standard.
Ditto for all enums.
Quoted 3 lines
drivers/iio/light/isl76683.c new file +3
-0+ISL76683_DIODE_IR , + ISL76683_DIODE_DIFF, +};
...
drivers/iio/light/isl76683.c line 55
Quoted 2 lines
drivers/iio/light/isl76683.c new file +2
-0+static const int isl76683_lux_ranges_available[] = { +1000 ,4000 ,16000 ,64000 };
Wrong indentation, i.e. '};' part should be on a separate line.
...
drivers/iio/light/isl76683.c line 71
Quoted 10 lines
drivers/iio/light/isl76683.c new file +9
-0+struct isl76683_chip { +enum isl76683_lux_range luxrange; +enum isl76683_dmode photodiode; +struct i2c_client *client; +struct regmap *rmp; +struct completion irq_complete; +struct iio_trigger *trig; +bool trig_enabled; +struct mutex lock;
Lock must be explained. What's for?
Quoted 2 lines
(quoted diff) +2
-0+ s64 time_ns; +};
...
drivers/iio/light/isl76683.c line 164
Quoted 10 lines
drivers/iio/light/isl76683.c new file +8
-0+static int isl76683_singleshot_conversion (struct isl76683_chip *chip,int *val) +{ +long timeout; +int ret; +/* wait for measurement to complete */ + timeout =wait_for_completion_interruptible_timeout ( + &chip->irq_complete, +msecs_to_jiffies (5000 ));
Magic number. Add a self-explanatory definition with explanation of the chosen value.
drivers/iio/light/isl76683.c line 176
Quoted 12 lines
drivers/iio/light/isl76683.c new file +12
-0+if (timeout ==0 ) { +dev_err (&chip->client->dev,"measurement timed out\n" ); +return -ETIMEDOUT ; + }else if (timeout <0 ) { +dev_err (&chip->client->dev,"wait for measurement failed\n" ); +return -EINTR ; + } + + ret =isl76683_get_sensordata (chip, val); +if (ret) { +dev_err (&chip->client->dev,"%s: Error %d reading lux\n" , + __func__, ret);
Drop __func__, it doesn't bring any value.
Quoted 5 lines
drivers/iio/light/isl76683.c new file +5
-0+return ret; + } + +return IIO_VAL_INT ; +}
...
drivers/iio/light/isl76683.c line 295
Quoted 4 lines
drivers/iio/light/isl76683.c new file +3
-0+static irqreturn_t isl76683_trigger_handler (int irq,void *p) +{ +done:
out_unlock: ?
Quoted 4 lines
drivers/iio/light/isl76683.c new file +4
-0+mutex_unlock (&chip->lock); +iio_trigger_notify_done (indio_dev->trig); +return IRQ_HANDLED ; +}
...
drivers/iio/light/isl76683.c line 358
Quoted 6 lines
drivers/iio/light/isl76683.c new file +6
-0+case IIO_CHAN_INFO_SCALE : + *val = isl76683_lux_ranges_available[chip->luxrange]; +return IIO_VAL_INT ; + } + +return -EINVAL ;
default case?
...
drivers/iio/light/isl76683.c line 379
Quoted 12 lines
drivers/iio/light/isl76683.c new file +12
-0+switch (mask) { +case IIO_CHAN_INFO_SCALE : +mutex_lock (&chip->lock); + chip->luxrange =find_closest (val, + isl76683_lux_ranges_available, +ARRAY_SIZE (isl76683_lux_ranges_available)); + ret =isl76683_set_config (chip); +mutex_unlock (&chip->lock); +return ret; + } + +return -EINVAL ;
Ditto.
...
drivers/iio/light/isl76683.c line 383
Quoted 2 lines
drivers/iio/light/isl76683.c new file +2
-0+static IIO_CONST_ATTR(in_illuminance_scale_available, + ISL76683_LUXRANGE_STR);
One line?
...
drivers/iio/light/isl76683.c line 444
Quoted 12 lines
drivers/iio/light/isl76683.c new file +11
-0+static int isl76683_set_trigger_state (struct iio_trigger *trig,bool enable) +{ +struct isl76683_chip *chip =iio_trigger_get_drvdata (trig); +int ret; +if (enable) { + chip->trig_enabled = true; + ret =isl76683_start_measurement (chip); +if (ret <0 ) +return ret; + }else + chip->trig_enabled = false;
chip->trig_enabled = enable;
if (chip->trig_enabled) {
...
}Quoted 2 lines
(quoted diff) +2
-0+ return 0; +}
...
drivers/iio/light/isl76683.c line 476
Quoted 6 lines
drivers/iio/light/isl76683.c new file +5
-0+ chip->rmp =devm_regmap_init_i2c (client, &isl76683_regmap_config); +if (IS_ERR (chip->rmp)) { + ret =PTR_ERR (chip->rmp); +dev_err (dev,"%s: Error %d initializing regmap\n" , + __func__, ret);
Drop __func__.
Quoted 2 lines
(quoted diff) +2
-0+ return ret; + }
...
drivers/iio/light/isl76683.c line 497
Quoted 2 lines
drivers/iio/light/isl76683.c new file +2
-0+ chip->trig =devm_iio_trigger_alloc (dev,"%s-dev%d" , + indio_dev->name, indio_dev->id);
One line?
Quoted 2 lines
drivers/iio/light/isl76683.c new file +2
-0+if (!chip->trig) +return -ENOMEM ;
...
drivers/iio/light/isl76683.c line 507
Quoted 3 lines
drivers/iio/light/isl76683.c new file +3
-0+ ret = devm_request_irq(dev, client->irq, + isl76683_interrupt_handler, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
One short for non-threaded IRQ?! Perhaps you wanted a threaded IRQ handler?
Quoted 5 lines
drivers/iio/light/isl76683.c new file +5
-0+ "isl76683_event", indio_dev); +if (ret) { +dev_err (dev,"irq request error\n" ); +return ret; + }
...
drivers/iio/light/isl76683.c line 544
Quoted 4 lines
drivers/iio/light/isl76683.c new file +4
-0+ ret =devm_iio_device_register (dev, indio_dev); +if (ret) { +dev_err (dev,"%s(): iio registration failed with error %d\n" , + __func__, ret);
Drop __func__.
Quoted 1 line
+ }
...
drivers/iio/light/isl76683.c line 553
Quoted 5 lines
drivers/iio/light/isl76683.c new file +4
-0+static int __maybe_unused isl76683_suspend (struct device *dev) +{ +struct isl76683_chip *chip = +iio_priv (i2c_get_clientdata (to_i2c_client (dev)));
One line.
Quoted 1 line
+}
...
drivers/iio/light/isl76683.c line 567
Quoted 4 lines
drivers/iio/light/isl76683.c new file +4
-0+static int __maybe_unused isl76683_resume (struct device *dev) +{ +struct isl76683_chip *chip = +iio_priv (i2c_get_clientdata (to_i2c_client (dev)));
Ditto.
In both cases use dev_get_drvdata() IIUC.
drivers/iio/light/isl76683.c line 90
Quoted 3 lines
drivers/iio/light/isl76683.c new file +2
-0+} +
Useless blank line.
Quoted 1 line
+static
SIMPLE_DEV_PM_OPS(isl76683_pm_ops, isl76683_suspend, isl76683_resume);
--
With Best Regards,
Andy Shevchenko
PATCH 2/2 dt-bindings: iio: light: add isl76683 light bindings
In reply to Christoph FritzThis patch adds documentation of device tree bindings for Intersil isl76683 light sensor.
--- .../bindings/iio/light/isil,isl76683.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/light/isil,isl76683.yaml
Documentation/devicetree/bindings/iio/light/isil,isl76683.yaml new file +48 -0
@@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/light/isil,isil76683.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Intersil isl76683 ambient light sensor + +maintainers: + - Christoph Fritz <[email protected]> + +description: | + https://www.intersil.com/content/dam/Intersil/documents/isl7/isl76683.pdf + +properties: + compatible: + enum: + - isil,isl76683 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + isl76683@74 { + compatible = "isil,isl76683"; + reg = <0x74>; + interrupt-parent = <&gpio2>; + interrupts = <20 IRQ_TYPE_FALLING>; + }; + }; +...
Signature · 1 line
2.29.2
Re: [PATCH 2/2] dt-bindings: iio: light: add isl76683 light bindings
Quoted 4 lines · On Wed, 2 Jun 2021 15:45:12 +0200 Christoph Fritz <[email protected]>…
This patch adds documentation of device tree bindings for Intersil isl76683 light sensor.
Signed-off-by Christoph Fritz <[email protected]>
Hi Christoph,
One trivial comment inline. As mentioned in the driver review it might be nice to relax the requirement for the irq if we can sensibly do so. Far too common for people to not wire it up for simple sensors.
Jonathan
Quoted 19 lines
--- .../bindings/iio/light/isil,isl76683.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/light/isil,isl76683.yamlDocumentation/devicetree/bindings/iio/light/isil,isl76683.yaml new file +8
-0@@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/light/isil,isil76683.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Intersil isl76683 ambient light sensor +
Documentation/devicetree/bindings/iio/light/isil,isl76683.yaml line 18
Quoted 10 lines
Documentation/devicetree/bindings/iio/light/isil,isl76683.yaml new file +10
-0+maintainers: + - Christoph Fritz <[email protected]> + +description: | + https://www.intersil.com/content/dam/Intersil/documents/isl7/isl76683.pdf + +properties: + compatible: + enum: + - isil,isl76683
Unless you are expecting to add new devices sharing this binding, perhaps
const: isil,isl77683
is more appropriate.
Quoted 30 lines
Documentation/devicetree/bindings/iio/light/isil,isl76683.yaml new file +30
-0+ + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + isl76683@74 { + compatible = "isil,isl76683"; + reg = <0x74>; + interrupt-parent = <&gpio2>; + interrupts = <20 IRQ_TYPE_FALLING>; + }; + }; +...