Merge tag 'iio-for-5.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[linux-block.git] / drivers / iio / light / vcnl4000.c

diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index ec803c1e81df2b932594568dc6b4f5405efb9a79..985cc39ede8e1f6a87795218649da351f71d3466 100644 (file)
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -83,6 +83,7 @@ struct vcnl4000_data {
        struct mutex vcnl4000_lock;
        struct vcnl4200_channel vcnl4200_al;
        struct vcnl4200_channel vcnl4200_ps;
+       uint32_t near_level;
 };
 
 struct vcnl4000_chip_spec {
@@ -343,6 +344,25 @@ static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = {
        },
 };
 
+static ssize_t vcnl4000_read_near_level(struct iio_dev *indio_dev,
+                                       uintptr_t priv,
+                                       const struct iio_chan_spec *chan,
+                                       char *buf)
+{
+       struct vcnl4000_data *data = iio_priv(indio_dev);
+
+       return sprintf(buf, "%u\n", data->near_level);
+}
+
+static const struct iio_chan_spec_ext_info vcnl4000_ext_info[] = {
+       {
+               .name = "nearlevel",
+               .shared = IIO_SEPARATE,
+               .read = vcnl4000_read_near_level,
+       },
+       { /* sentinel */ }
+};
+
 static const struct iio_chan_spec vcnl4000_channels[] = {
        {
                .type = IIO_LIGHT,
@@ -351,6 +371,7 @@ static const struct iio_chan_spec vcnl4000_channels[] = {
        }, {
                .type = IIO_PROXIMITY,
                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+               .ext_info = vcnl4000_ext_info,
        }
 };
 
@@ -440,6 +461,10 @@ static int vcnl4000_probe(struct i2c_client *client,
        dev_dbg(&client->dev, "%s Ambient light/proximity sensor, Rev: %02x\n",
                data->chip_spec->prod, data->rev);
 
+       if (device_property_read_u32(&client->dev, "proximity-near-level",
+                                    &data->near_level))
+               data->near_level = 0;
+
        indio_dev->dev.parent = &client->dev;
        indio_dev->info = &vcnl4000_info;
        indio_dev->channels = vcnl4000_channels;