From: Ivan Mikhaylov <i.mikhaylov@yadro.com>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>
Cc: Ivan Mikhaylov <i.mikhaylov@yadro.com>,
<linux-kernel@vger.kernel.org>, <linux-iio@vger.kernel.org>,
<linux-hwmon@vger.kernel.org>
Subject: [PATCH 2/4] iio: proximity: vcnl3020: add threshold options
Date: Fri, 30 Apr 2021 18:24:17 +0300 [thread overview]
Message-ID: <20210430152419.261757-3-i.mikhaylov@yadro.com> (raw)
In-Reply-To: <20210430152419.261757-1-i.mikhaylov@yadro.com>
Add the low/high threshold options.
Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com>
---
drivers/iio/proximity/vcnl3020.c | 94 ++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/drivers/iio/proximity/vcnl3020.c b/drivers/iio/proximity/vcnl3020.c
index 25c6bdba3ede..0dfa6a0b5eec 100644
--- a/drivers/iio/proximity/vcnl3020.c
+++ b/drivers/iio/proximity/vcnl3020.c
@@ -254,6 +254,90 @@ static bool vcnl3020_is_thr_enabled(struct vcnl3020_data *data)
return !!(icr & VCNL_ICR_THRES_EN);
}
+static int vcnl3020_read_event(struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan,
+ enum iio_event_type type,
+ enum iio_event_direction dir,
+ enum iio_event_info info,
+ int *val, int *val2)
+{
+ int rc;
+ struct vcnl3020_data *data = iio_priv(indio_dev);
+ __be16 res;
+
+ switch (info) {
+ case IIO_EV_INFO_VALUE:
+ switch (dir) {
+ case IIO_EV_DIR_RISING:
+ rc = regmap_bulk_read(data->regmap, VCNL_PS_HI_THR_HI,
+ &res, 2);
+ *val = be16_to_cpu(res);
+ if (rc < 0)
+ return rc;
+ return IIO_VAL_INT;
+ case IIO_EV_DIR_FALLING:
+ rc = regmap_bulk_read(data->regmap, VCNL_PS_LO_THR_HI,
+ &res, 2);
+ *val = be16_to_cpu(res);
+ if (rc < 0)
+ return rc;
+ return IIO_VAL_INT;
+ default:
+ return -EINVAL;
+ }
+ default:
+ return -EINVAL;
+ }
+}
+
+static int vcnl3020_write_event(struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan,
+ enum iio_event_type type,
+ enum iio_event_direction dir,
+ enum iio_event_info info,
+ int val, int val2)
+{
+ int rc;
+ __be16 buf;
+ struct vcnl3020_data *data = iio_priv(indio_dev);
+
+ rc = iio_device_claim_direct_mode(indio_dev);
+ if (rc)
+ return rc;
+
+ switch (info) {
+ case IIO_EV_INFO_VALUE:
+ switch (dir) {
+ case IIO_EV_DIR_RISING:
+ /* 16 bit word/ low * high */
+ buf = cpu_to_be16(val);
+ rc = regmap_bulk_write(data->regmap, VCNL_PS_HI_THR_HI,
+ &buf, 2);
+ if (rc < 0)
+ goto end;
+ rc = IIO_VAL_INT;
+ goto end;
+ case IIO_EV_DIR_FALLING:
+ buf = cpu_to_be16(val);
+ rc = regmap_bulk_write(data->regmap, VCNL_PS_LO_THR_HI,
+ &buf, 2);
+ if (rc < 0)
+ goto end;
+ rc = IIO_VAL_INT;
+ goto end;
+ default:
+ rc = -EINVAL;
+ goto end;
+ }
+ default:
+ rc = -EINVAL;
+ goto end;
+ }
+end:
+ iio_device_release_direct_mode(indio_dev);
+ return rc;
+}
+
static int vcnl3020_config_threshold(struct iio_dev *indio_dev, bool state)
{
struct vcnl3020_data *data = iio_priv(indio_dev);
@@ -334,6 +418,14 @@ static int vcnl3020_read_event_config(struct iio_dev *indio_dev,
static const struct iio_event_spec vcnl3020_event_spec[] = {
{
+ .type = IIO_EV_TYPE_THRESH,
+ .dir = IIO_EV_DIR_RISING,
+ .mask_separate = BIT(IIO_EV_INFO_VALUE),
+ }, {
+ .type = IIO_EV_TYPE_THRESH,
+ .dir = IIO_EV_DIR_FALLING,
+ .mask_separate = BIT(IIO_EV_INFO_VALUE),
+ }, {
.type = IIO_EV_TYPE_THRESH,
.dir = IIO_EV_DIR_EITHER,
.mask_separate = BIT(IIO_EV_INFO_ENABLE),
@@ -423,6 +515,8 @@ static const struct iio_info vcnl3020_info = {
.read_raw = vcnl3020_read_raw,
.write_raw = vcnl3020_write_raw,
.read_avail = vcnl3020_read_avail,
+ .read_event_value = vcnl3020_read_event,
+ .write_event_value = vcnl3020_write_event,
.read_event_config = vcnl3020_read_event_config,
.write_event_config = vcnl3020_write_event_config,
};
--
2.26.3
next prev parent reply other threads:[~2021-04-30 15:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 15:24 [PATCH 0/4] add periodic mode, threshold options and hwmon Ivan Mikhaylov
2021-04-30 15:24 ` [PATCH 1/4] iio: proximity: vcnl3020: add periodic mode Ivan Mikhaylov
2021-05-01 18:48 ` Andy Shevchenko
2021-05-02 18:00 ` Jonathan Cameron
2021-05-04 19:07 ` Ivan Mikhaylov
2021-05-05 8:22 ` Jonathan Cameron
2021-04-30 15:24 ` Ivan Mikhaylov [this message]
2021-05-01 18:51 ` [PATCH 2/4] iio: proximity: vcnl3020: add threshold options Andy Shevchenko
2021-04-30 15:24 ` [PATCH 3/4] iio: proximity: vncl3020: remove mutex from vcnl3020_data Ivan Mikhaylov
2021-05-01 18:53 ` Andy Shevchenko
2021-05-02 17:53 ` Jonathan Cameron
2021-04-30 15:24 ` [PATCH 4/4] hwmon: vcnl3020: add hwmon driver for intrusion sensor Ivan Mikhaylov
2021-04-30 16:38 ` Guenter Roeck
2021-05-04 19:46 ` Ivan Mikhaylov
2021-05-05 8:26 ` Jonathan Cameron
2021-05-05 14:02 ` Guenter Roeck
2021-05-17 17:08 ` Ivan Mikhaylov
2021-05-01 7:07 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430152419.261757-3-i.mikhaylov@yadro.com \
--to=i.mikhaylov@yadro.com \
--cc=jdelvare@suse.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).