| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20210430152419.261757-3-i.mikhaylov@yadro.com>
Date: Fri, 30 Apr 2021 18:24:17 +0300
From: Ivan Mikhaylov <i.mikhaylov@...ro.com>
To: Jonathan Cameron <jic23@...nel.org>,
Lars-Peter Clausen <lars@...afoo.de>,
Peter Meerwald-Stadler <pmeerw@...erw.net>,
Jean Delvare <jdelvare@...e.com>,
Guenter Roeck <linux@...ck-us.net>
CC: Ivan Mikhaylov <i.mikhaylov@...ro.com>,
<linux-kernel@...r.kernel.org>, <linux-iio@...r.kernel.org>,
<linux-hwmon@...r.kernel.org>
Subject: [PATCH 2/4] iio: proximity: vcnl3020: add threshold options
Add the low/high threshold options.
Signed-off-by: Ivan Mikhaylov <i.mikhaylov@...ro.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
Powered by blists - more mailing lists