This value inidcates the proximity level that should be considered "close". Signed-off-by: Nikita Travkin <nikita@trvn.ru> --- .../devicetree/bindings/iio/light/liteon,ltr501.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/light/liteon,ltr501.yaml b/Documentation/devicetree/bindings/iio/light/liteon,ltr501.yaml index db0407bc9209..c8074f180a79 100644 --- a/Documentation/devicetree/bindings/iio/light/liteon,ltr501.yaml +++ b/Documentation/devicetree/bindings/iio/light/liteon,ltr501.yaml @@ -9,6 +9,9 @@ title: LiteON LTR501 I2C Proximity and Light sensor maintainers: - Nikita Travkin <nikita@trvn.ru> +allOf: + - $ref: ../common.yaml# + properties: compatible: enum: @@ -25,6 +28,8 @@ properties: interrupts: maxItems: 1 + proximity-near-level: true + additionalProperties: false required: @@ -42,6 +47,8 @@ examples: light-sensor@23 { compatible = "liteon,ltr559"; reg = <0x23>; + proximity-near-level = <75>; + vdd-supply = <&pm8916_l17>; vddio-supply = <&pm8916_l6>; -- 2.30.2
Userspace tools like iio-sensor-proxy need to know the proximity level that should be considered "near". This value is hardware-specific and can be defined via the devicetree. Allow the driver to export the near level. Signed-off-by: Nikita Travkin <nikita@trvn.ru> --- The changes are mostly copied from vcnl4000 patchset introducing the property: https://lore.kernel.org/linux-iio/cover.1586094535.git.agx@sigxcpu.org/ --- drivers/iio/light/ltr501.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c index 64ba04c275e8..47d61ec2bb50 100644 --- a/drivers/iio/light/ltr501.c +++ b/drivers/iio/light/ltr501.c @@ -166,6 +166,7 @@ struct ltr501_data { struct regmap_field *reg_ps_rate; struct regmap_field *reg_als_prst; struct regmap_field *reg_ps_prst; + uint32_t near_level; }; static const struct ltr501_samp_table ltr501_als_samp_table[] = { @@ -525,6 +526,25 @@ static int ltr501_write_intr_prst(struct ltr501_data *data, return -EINVAL; } +static ssize_t ltr501_read_near_level(struct iio_dev *indio_dev, + uintptr_t priv, + const struct iio_chan_spec *chan, + char *buf) +{ + struct ltr501_data *data = iio_priv(indio_dev); + + return sprintf(buf, "%u\n", data->near_level); +} + +static const struct iio_chan_spec_ext_info ltr501_ext_info[] = { + { + .name = "nearlevel", + .shared = IIO_SEPARATE, + .read = ltr501_read_near_level, + }, + { /* sentinel */ } +}; + static const struct iio_event_spec ltr501_als_event_spec[] = { { .type = IIO_EV_TYPE_THRESH, @@ -609,6 +629,7 @@ static const struct iio_chan_spec ltr501_channels[] = { }, .event_spec = ltr501_pxs_event_spec, .num_event_specs = ARRAY_SIZE(ltr501_pxs_event_spec), + .ext_info = ltr501_ext_info, }, IIO_CHAN_SOFT_TIMESTAMP(3), }; @@ -1531,6 +1552,10 @@ static int ltr501_probe(struct i2c_client *client, if ((partid >> 4) != data->chip_info->partid) return -ENODEV; + if (device_property_read_u32(&client->dev, "proximity-near-level", + &data->near_level)) + data->near_level = 0; + indio_dev->info = data->chip_info->info; indio_dev->channels = data->chip_info->channels; indio_dev->num_channels = data->chip_info->no_channels; -- 2.30.2
On Thu, 25 Nov 2021 17:56:46 +0500 Nikita Travkin <nikita@trvn.ru> wrote: > Userspace tools like iio-sensor-proxy need to know the proximity level > that should be considered "near". This value is hardware-specific and > can be defined via the devicetree. Allow the driver to export the near > level. > > Signed-off-by: Nikita Travkin <nikita@trvn.ru> Hi Nikita, This looks fine to me, but I'd like to leave a little time for others to look including DT review. Thanks, Jonathan > > --- > The changes are mostly copied from vcnl4000 patchset introducing the > property: > https://lore.kernel.org/linux-iio/cover.1586094535.git.agx@sigxcpu.org/ > --- > drivers/iio/light/ltr501.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c > index 64ba04c275e8..47d61ec2bb50 100644 > --- a/drivers/iio/light/ltr501.c > +++ b/drivers/iio/light/ltr501.c > @@ -166,6 +166,7 @@ struct ltr501_data { > struct regmap_field *reg_ps_rate; > struct regmap_field *reg_als_prst; > struct regmap_field *reg_ps_prst; > + uint32_t near_level; > }; > > static const struct ltr501_samp_table ltr501_als_samp_table[] = { > @@ -525,6 +526,25 @@ static int ltr501_write_intr_prst(struct ltr501_data *data, > return -EINVAL; > } > > +static ssize_t ltr501_read_near_level(struct iio_dev *indio_dev, > + uintptr_t priv, > + const struct iio_chan_spec *chan, > + char *buf) > +{ > + struct ltr501_data *data = iio_priv(indio_dev); > + > + return sprintf(buf, "%u\n", data->near_level); > +} > + > +static const struct iio_chan_spec_ext_info ltr501_ext_info[] = { > + { > + .name = "nearlevel", > + .shared = IIO_SEPARATE, > + .read = ltr501_read_near_level, > + }, > + { /* sentinel */ } > +}; > + > static const struct iio_event_spec ltr501_als_event_spec[] = { > { > .type = IIO_EV_TYPE_THRESH, > @@ -609,6 +629,7 @@ static const struct iio_chan_spec ltr501_channels[] = { > }, > .event_spec = ltr501_pxs_event_spec, > .num_event_specs = ARRAY_SIZE(ltr501_pxs_event_spec), > + .ext_info = ltr501_ext_info, > }, > IIO_CHAN_SOFT_TIMESTAMP(3), > }; > @@ -1531,6 +1552,10 @@ static int ltr501_probe(struct i2c_client *client, > if ((partid >> 4) != data->chip_info->partid) > return -ENODEV; > > + if (device_property_read_u32(&client->dev, "proximity-near-level", > + &data->near_level)) > + data->near_level = 0; > + > indio_dev->info = data->chip_info->info; > indio_dev->channels = data->chip_info->channels; > indio_dev->num_channels = data->chip_info->no_channels;
On Thu, 25 Nov 2021 17:56:45 +0500, Nikita Travkin wrote:
> This value inidcates the proximity level that should be considered
> "close".
>
> Signed-off-by: Nikita Travkin <nikita@trvn.ru>
> ---
> .../devicetree/bindings/iio/light/liteon,ltr501.yaml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
On Wed, 1 Dec 2021 16:25:45 -0600
Rob Herring <robh@kernel.org> wrote:
> On Thu, 25 Nov 2021 17:56:45 +0500, Nikita Travkin wrote:
> > This value inidcates the proximity level that should be considered
> > "close".
> >
> > Signed-off-by: Nikita Travkin <nikita@trvn.ru>
> > ---
> > .../devicetree/bindings/iio/light/liteon,ltr501.yaml | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
>
> Reviewed-by: Rob Herring <robh@kernel.org>
Series applied to the togreg branch of iio.git.
I'll push it out as testing first to let 0-day see if it can find any
problems before I go breaking next ;)
Jonathan