| Message ID | 20220923114031.757011-3-marten.lindahl@axis.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add ps_it attributes for vcnl4040 | expand |
On Fri, 23 Sep 2022 13:40:31 +0200 Mårten Lindahl <marten.lindahl@axis.com> wrote: > Add read/write attribute for proximity integration time, and read > attribute for available proximity integration times for the vcnl4040 > chip. > > Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> Hi Mårten, One minor comment inline given I've asked for changes that mean you'll probably be doing a v3 anyway. Thanks, Jonathan > --- > drivers/iio/light/vcnl4000.c | 129 ++++++++++++++++++++++++++++++++++- > 1 file changed, 126 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c > index b2ecf8af1aa5..056079b592c6 100644 > --- a/drivers/iio/light/vcnl4000.c > +++ b/drivers/iio/light/vcnl4000.c > @@ -17,6 +17,7 @@ > * interrupts (VCNL4040, VCNL4200) > */ > > +#include <linux/bitfield.h> > #include <linux/module.h> > #include <linux/i2c.h> > #include <linux/err.h> > @@ -76,6 +77,7 @@ > > #define VCNL4040_ALS_CONF_ALS_SD BIT(0) /* Enable ambient light sensor */ > #define VCNL4040_PS_CONF1_PS_SD BIT(0) /* Enable proximity sensor */ > +#define VCNL4040_PS_CONF2_PS_IT GENMASK(3, 1) /* Proximity integration time */ > > /* Bit masks for interrupt registers. */ > #define VCNL4010_INT_THR_SEL BIT(0) /* Select threshold interrupt source */ > @@ -104,6 +106,17 @@ static const int vcnl4010_prox_sampling_frequency[][2] = { > {250, 0}, > }; > > +static const int vcnl4040_ps_it_times[][2] = { > + {0, 100}, > + {0, 150}, > + {0, 200}, > + {0, 250}, > + {0, 300}, > + {0, 350}, > + {0, 400}, > + {0, 800}, > +}; > + > #define VCNL4000_SLEEP_DELAY_MS 2000 /* before we enter pm_runtime_suspend */ > > enum vcnl4000_device_ids { > @@ -470,6 +483,55 @@ static int vcnl4000_set_pm_runtime_state(struct vcnl4000_data *data, bool on) > return ret; > } > > +static int vcnl4040_read_ps_it(struct vcnl4000_data *data, int *val, int *val2) > +{ > + int ret; > + > + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); > + if (ret < 0) > + return ret; > + > + ret = FIELD_GET(VCNL4040_PS_CONF2_PS_IT, ret); > + > + if (ret >= ARRAY_SIZE(vcnl4040_ps_it_times)) > + return -EINVAL; > + > + *val = vcnl4040_ps_it_times[ret][0]; > + *val2 = vcnl4040_ps_it_times[ret][1]; > + > + return 0; > +} > + > +static ssize_t vcnl4040_write_ps_it(struct vcnl4000_data *data, int val) > +{ > + unsigned int i; > + int ret, index = -1; > + > + for (i = 0; i < ARRAY_SIZE(vcnl4040_ps_it_times); i++) { > + if (val == vcnl4040_ps_it_times[i][1]) { > + index = i; > + break; > + } > + } > + > + if (index < 0) > + return -EINVAL; > + > + mutex_lock(&data->vcnl4000_lock); > + > + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); > + if (ret < 0) > + goto out; > + > + ret = (ret & ~VCNL4040_PS_CONF2_PS_IT) | > + FIELD_PREP(VCNL4040_PS_CONF2_PS_IT, index); It can be confusing to read ret both as a temporary to build value ad for the return code. I would introduce a u16 val and build the value in that. > + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, ret); > + > +out: > + mutex_unlock(&data->vcnl4000_lock); > + return ret; > +} > +
On Sat, Sep 24, 2022 at 06:40:44PM +0200, Jonathan Cameron wrote: > On Fri, 23 Sep 2022 13:40:31 +0200 > Mårten Lindahl <marten.lindahl@axis.com> wrote: > > > Add read/write attribute for proximity integration time, and read > > attribute for available proximity integration times for the vcnl4040 > > chip. > > > > Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> > Hi Mårten, > > One minor comment inline given I've asked for changes that mean you'll > probably be doing a v3 anyway. > > Thanks, > > Jonathan > > > --- > > drivers/iio/light/vcnl4000.c | 129 ++++++++++++++++++++++++++++++++++- > > 1 file changed, 126 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c > > index b2ecf8af1aa5..056079b592c6 100644 > > --- a/drivers/iio/light/vcnl4000.c > > +++ b/drivers/iio/light/vcnl4000.c > > @@ -17,6 +17,7 @@ > > * interrupts (VCNL4040, VCNL4200) > > */ > > > > +#include <linux/bitfield.h> > > #include <linux/module.h> > > #include <linux/i2c.h> > > #include <linux/err.h> > > @@ -76,6 +77,7 @@ > > > > #define VCNL4040_ALS_CONF_ALS_SD BIT(0) /* Enable ambient light sensor */ > > #define VCNL4040_PS_CONF1_PS_SD BIT(0) /* Enable proximity sensor */ > > +#define VCNL4040_PS_CONF2_PS_IT GENMASK(3, 1) /* Proximity integration time */ > > > > /* Bit masks for interrupt registers. */ > > #define VCNL4010_INT_THR_SEL BIT(0) /* Select threshold interrupt source */ > > @@ -104,6 +106,17 @@ static const int vcnl4010_prox_sampling_frequency[][2] = { > > {250, 0}, > > }; > > > > +static const int vcnl4040_ps_it_times[][2] = { > > + {0, 100}, > > + {0, 150}, > > + {0, 200}, > > + {0, 250}, > > + {0, 300}, > > + {0, 350}, > > + {0, 400}, > > + {0, 800}, > > +}; > > + > > #define VCNL4000_SLEEP_DELAY_MS 2000 /* before we enter pm_runtime_suspend */ > > > > enum vcnl4000_device_ids { > > @@ -470,6 +483,55 @@ static int vcnl4000_set_pm_runtime_state(struct vcnl4000_data *data, bool on) > > return ret; > > } > > > > +static int vcnl4040_read_ps_it(struct vcnl4000_data *data, int *val, int *val2) > > +{ > > + int ret; > > + > > + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); > > + if (ret < 0) > > + return ret; > > + > > + ret = FIELD_GET(VCNL4040_PS_CONF2_PS_IT, ret); > > + > > + if (ret >= ARRAY_SIZE(vcnl4040_ps_it_times)) > > + return -EINVAL; > > + > > + *val = vcnl4040_ps_it_times[ret][0]; > > + *val2 = vcnl4040_ps_it_times[ret][1]; > > + > > + return 0; > > +} > > + > > +static ssize_t vcnl4040_write_ps_it(struct vcnl4000_data *data, int val) > > +{ > > + unsigned int i; > > + int ret, index = -1; > > + > > + for (i = 0; i < ARRAY_SIZE(vcnl4040_ps_it_times); i++) { > > + if (val == vcnl4040_ps_it_times[i][1]) { > > + index = i; > > + break; > > + } > > + } > > + > > + if (index < 0) > > + return -EINVAL; > > + > > + mutex_lock(&data->vcnl4000_lock); > > + > > + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); > > + if (ret < 0) > > + goto out; > > + > > + ret = (ret & ~VCNL4040_PS_CONF2_PS_IT) | > > + FIELD_PREP(VCNL4040_PS_CONF2_PS_IT, index); > > It can be confusing to read ret both as a temporary to build value ad for the > return code. I would introduce a > u16 val > and build the value in that. Hi Jonathan! Thanks. I'll do so. As there already is a 'val' I will call it 'regval'. Kind regards Mårten > > > + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, ret); > > + > > +out: > > + mutex_unlock(&data->vcnl4000_lock); > > + return ret; > > +} > > +
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index b2ecf8af1aa5..056079b592c6 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -17,6 +17,7 @@ * interrupts (VCNL4040, VCNL4200) */ +#include <linux/bitfield.h> #include <linux/module.h> #include <linux/i2c.h> #include <linux/err.h> @@ -76,6 +77,7 @@ #define VCNL4040_ALS_CONF_ALS_SD BIT(0) /* Enable ambient light sensor */ #define VCNL4040_PS_CONF1_PS_SD BIT(0) /* Enable proximity sensor */ +#define VCNL4040_PS_CONF2_PS_IT GENMASK(3, 1) /* Proximity integration time */ /* Bit masks for interrupt registers. */ #define VCNL4010_INT_THR_SEL BIT(0) /* Select threshold interrupt source */ @@ -104,6 +106,17 @@ static const int vcnl4010_prox_sampling_frequency[][2] = { {250, 0}, }; +static const int vcnl4040_ps_it_times[][2] = { + {0, 100}, + {0, 150}, + {0, 200}, + {0, 250}, + {0, 300}, + {0, 350}, + {0, 400}, + {0, 800}, +}; + #define VCNL4000_SLEEP_DELAY_MS 2000 /* before we enter pm_runtime_suspend */ enum vcnl4000_device_ids { @@ -470,6 +483,55 @@ static int vcnl4000_set_pm_runtime_state(struct vcnl4000_data *data, bool on) return ret; } +static int vcnl4040_read_ps_it(struct vcnl4000_data *data, int *val, int *val2) +{ + int ret; + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); + if (ret < 0) + return ret; + + ret = FIELD_GET(VCNL4040_PS_CONF2_PS_IT, ret); + + if (ret >= ARRAY_SIZE(vcnl4040_ps_it_times)) + return -EINVAL; + + *val = vcnl4040_ps_it_times[ret][0]; + *val2 = vcnl4040_ps_it_times[ret][1]; + + return 0; +} + +static ssize_t vcnl4040_write_ps_it(struct vcnl4000_data *data, int val) +{ + unsigned int i; + int ret, index = -1; + + for (i = 0; i < ARRAY_SIZE(vcnl4040_ps_it_times); i++) { + if (val == vcnl4040_ps_it_times[i][1]) { + index = i; + break; + } + } + + if (index < 0) + return -EINVAL; + + mutex_lock(&data->vcnl4000_lock); + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); + if (ret < 0) + goto out; + + ret = (ret & ~VCNL4040_PS_CONF2_PS_IT) | + FIELD_PREP(VCNL4040_PS_CONF2_PS_IT, index); + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, ret); + +out: + mutex_unlock(&data->vcnl4000_lock); + return ret; +} + static int vcnl4000_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -506,6 +568,47 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev, *val = 0; *val2 = data->al_scale; return IIO_VAL_INT_PLUS_MICRO; + case IIO_CHAN_INFO_INT_TIME: + if (chan->type != IIO_PROXIMITY) + return -EINVAL; + ret = vcnl4040_read_ps_it(data, val, val2); + if (ret < 0) + return ret; + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } +} + +static int vcnl4040_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct vcnl4000_data *data = iio_priv(indio_dev); + + switch (mask) { + case IIO_CHAN_INFO_INT_TIME: + if (val != 0) + return -EINVAL; + if (chan->type != IIO_PROXIMITY) + return -EINVAL; + return vcnl4040_write_ps_it(data, val2); + default: + return -EINVAL; + } +} + +static int vcnl4040_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_INT_TIME: + *vals = (int *)vcnl4040_ps_it_times; + *type = IIO_VAL_INT_PLUS_MICRO; + *length = 2 * ARRAY_SIZE(vcnl4040_ps_it_times); + return IIO_AVAIL_LIST; default: return -EINVAL; } @@ -844,6 +947,20 @@ static const struct iio_chan_spec vcnl4010_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(1), }; +static const struct iio_chan_spec vcnl4040_channels[] = { + { + .type = IIO_LIGHT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + }, { + .type = IIO_PROXIMITY, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME), + .ext_info = vcnl4000_ext_info, + } +}; + static const struct iio_info vcnl4000_info = { .read_raw = vcnl4000_read_raw, }; @@ -858,6 +975,12 @@ static const struct iio_info vcnl4010_info = { .write_event_config = vcnl4010_write_event_config, }; +static const struct iio_info vcnl4040_info = { + .read_raw = vcnl4000_read_raw, + .write_raw = vcnl4040_write_raw, + .read_avail = vcnl4040_read_avail, +}; + static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = { [VCNL4000] = { .prod = "VCNL4000", @@ -887,9 +1010,9 @@ static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = { .measure_light = vcnl4200_measure_light, .measure_proximity = vcnl4200_measure_proximity, .set_power_state = vcnl4200_set_power_state, - .channels = vcnl4000_channels, - .num_channels = ARRAY_SIZE(vcnl4000_channels), - .info = &vcnl4000_info, + .channels = vcnl4040_channels, + .num_channels = ARRAY_SIZE(vcnl4040_channels), + .info = &vcnl4040_info, .irq_support = false, }, [VCNL4200] = {
Add read/write attribute for proximity integration time, and read attribute for available proximity integration times for the vcnl4040 chip. Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> --- drivers/iio/light/vcnl4000.c | 129 ++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 3 deletions(-)