From patchwork Fri Apr 30 15:24:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Mikhaylov X-Patchwork-Id: 12233639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC394C43460 for ; Fri, 30 Apr 2021 15:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C5FC61186 for ; Fri, 30 Apr 2021 15:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230195AbhD3PRB (ORCPT ); Fri, 30 Apr 2021 11:17:01 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55696 "EHLO mta-01.yadro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229969AbhD3PQy (ORCPT ); Fri, 30 Apr 2021 11:16:54 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 1C9244148B; Fri, 30 Apr 2021 15:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1619795763; x=1621610164; bh=W8rRLVjeBpKReObsLYESpW8i4F7awUTnC6l JDY0jLUA=; b=kZQguzMC6iW9Brha0S0ooYab3+yFMjOtBQCmhocc3fP2eq2r1oy sjRKXeLb4whCqNHQvKIJn9vueeBxTbAoxwlDcvugKcTjg0XsXj00QiAu6gXTx6Nd ua9V2ODpFpmvVPlX1Nsm3kKqTZQAXkJyCKJWbXm1gP3OFEgSJYX7aPRM= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x54U983Ft57f; Fri, 30 Apr 2021 18:16:03 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id D19294148E; Fri, 30 Apr 2021 18:16:03 +0300 (MSK) Received: from localhost.yadro.com (10.199.0.97) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Fri, 30 Apr 2021 18:16:03 +0300 From: Ivan Mikhaylov To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Jean Delvare , Guenter Roeck CC: Ivan Mikhaylov , , , Subject: [PATCH 1/4] iio: proximity: vcnl3020: add periodic mode Date: Fri, 30 Apr 2021 18:24:16 +0300 Message-ID: <20210430152419.261757-2-i.mikhaylov@yadro.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430152419.261757-1-i.mikhaylov@yadro.com> References: <20210430152419.261757-1-i.mikhaylov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [10.199.0.97] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-03.corp.yadro.com (172.17.100.103) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add the possibility to run proximity sensor in periodic measurement mode. Signed-off-by: Ivan Mikhaylov --- drivers/iio/proximity/vcnl3020.c | 138 +++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/drivers/iio/proximity/vcnl3020.c b/drivers/iio/proximity/vcnl3020.c index 43817f6b3086..25c6bdba3ede 100644 --- a/drivers/iio/proximity/vcnl3020.c +++ b/drivers/iio/proximity/vcnl3020.c @@ -36,6 +36,21 @@ #define VCNL_PS_OD BIT(3) /* start on-demand proximity * measurement */ +#define VCNL_PS_EN BIT(1) /* Enables periodic proximity + * measurement + */ +#define VCNL_PS_SELFTIMED_EN BIT(0) /* Enables state machine and LP + * oscillator for self timed + * measurements + */ + +/* Bit masks for ICR */ +#define VCNL_ICR_THRES_EN BIT(1) /* Enable interrupts on low or high + * thresholds */ + +/* Bit masks for ISR */ +#define VCNL_INT_TH_HI BIT(0) /* High threshold hit */ +#define VCNL_INT_TH_LOW BIT(1) /* Low threshold hit */ #define VCNL_ON_DEMAND_TIMEOUT_US 100000 #define VCNL_POLL_US 20000 @@ -215,12 +230,124 @@ static int vcnl3020_write_proxy_samp_freq(struct vcnl3020_data *data, int val, return regmap_write(data->regmap, VCNL_PROXIMITY_RATE, index); } +static bool vcnl3020_is_in_periodic_mode(struct vcnl3020_data *data) +{ + int rc; + unsigned int cmd; + + rc = regmap_read(data->regmap, VCNL_COMMAND, &cmd); + if (rc) + return false; + + return !!(cmd & VCNL_PS_SELFTIMED_EN); +} + +static bool vcnl3020_is_thr_enabled(struct vcnl3020_data *data) +{ + int rc; + unsigned int icr; + + rc = regmap_read(data->regmap, VCNL_PS_ICR, &icr); + if (rc) + return false; + + return !!(icr & VCNL_ICR_THRES_EN); +} + +static int vcnl3020_config_threshold(struct iio_dev *indio_dev, bool state) +{ + struct vcnl3020_data *data = iio_priv(indio_dev); + int rc; + int icr; + int cmd; + int isr; + + if (state) { + rc = iio_device_claim_direct_mode(indio_dev); + if (rc) + return rc; + + /* Enable periodic measurement of proximity data. */ + cmd = VCNL_PS_EN | VCNL_PS_SELFTIMED_EN; + + /* + * Enable interrupts on threshold, for proximity data by + * default. + */ + icr = VCNL_ICR_THRES_EN; + } else { + if (!vcnl3020_is_thr_enabled(data)) + return 0; + + cmd = 0; + icr = 0; + isr = 0; + } + + rc = regmap_write(data->regmap, VCNL_COMMAND, cmd); + if (rc) + goto end; + + rc = regmap_write(data->regmap, VCNL_PS_ICR, icr); + if (rc) + goto end; + + if (!state) + /* Clear interrupts */ + rc = regmap_write(data->regmap, VCNL_ISR, isr); + +end: + if (state) + iio_device_release_direct_mode(indio_dev); + + return rc; +} + +static int vcnl3020_write_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + int state) +{ + switch (chan->type) { + case IIO_PROXIMITY: + return vcnl3020_config_threshold(indio_dev, state); + default: + return -EINVAL; + } +} + +static int vcnl3020_read_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct vcnl3020_data *data = iio_priv(indio_dev); + + switch (chan->type) { + case IIO_PROXIMITY: + return vcnl3020_is_thr_enabled(data); + default: + return -EINVAL; + } +} + +static const struct iio_event_spec vcnl3020_event_spec[] = { + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_EITHER, + .mask_separate = BIT(IIO_EV_INFO_ENABLE), + }, +}; + static const struct iio_chan_spec vcnl3020_channels[] = { { .type = IIO_PROXIMITY, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SAMP_FREQ), .info_mask_separate_available = BIT(IIO_CHAN_INFO_SAMP_FREQ), + .event_spec = vcnl3020_event_spec, + .num_event_specs = ARRAY_SIZE(vcnl3020_event_spec), }, }; @@ -233,6 +360,11 @@ static int vcnl3020_read_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_RAW: + + /* Protect against event capture. */ + if (vcnl3020_is_in_periodic_mode(data)) + return -EBUSY; + rc = vcnl3020_measure_proximity(data, val); if (rc) return rc; @@ -254,6 +386,10 @@ static int vcnl3020_write_raw(struct iio_dev *indio_dev, int rc; struct vcnl3020_data *data = iio_priv(indio_dev); + /* Protect against event capture. */ + if (vcnl3020_is_in_periodic_mode(data)) + return -EBUSY; + switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: rc = iio_device_claim_direct_mode(indio_dev); @@ -287,6 +423,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_config = vcnl3020_read_event_config, + .write_event_config = vcnl3020_write_event_config, }; static const struct regmap_config vcnl3020_regmap_config = { From patchwork Fri Apr 30 15:24:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Mikhaylov X-Patchwork-Id: 12233637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06E1FC43462 for ; Fri, 30 Apr 2021 15:16:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB3636143D for ; Fri, 30 Apr 2021 15:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230227AbhD3PRE (ORCPT ); Fri, 30 Apr 2021 11:17:04 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55714 "EHLO mta-01.yadro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230104AbhD3PQz (ORCPT ); Fri, 30 Apr 2021 11:16:55 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 0113C4148E; Fri, 30 Apr 2021 15:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1619795764; x=1621610165; bh=xN26c+iDe10Fz8GFaWlgjIyKKxDcZvKGebP GdZ88n4k=; b=ACM+vfmw3TFb4/7JcK9Pg2i9nEAJDOa4Nk4+gcYPQEbnGHFiRyb pupLAhrwtPRCpmdLfY4CgzqHO2Wo/fP/PwgyL4FlGwOWmdHfsCOYrBjniVKgOF5W QqiK1yi1jnVBxTXgYC9r4zUclg49iQBFxMmqQiXdPGjvemQynp0TScbc= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2GETdw06S2N2; Fri, 30 Apr 2021 18:16:04 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id D7D1841490; Fri, 30 Apr 2021 18:16:03 +0300 (MSK) Received: from localhost.yadro.com (10.199.0.97) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Fri, 30 Apr 2021 18:16:03 +0300 From: Ivan Mikhaylov To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Jean Delvare , Guenter Roeck CC: Ivan Mikhaylov , , , Subject: [PATCH 2/4] iio: proximity: vcnl3020: add threshold options Date: Fri, 30 Apr 2021 18:24:17 +0300 Message-ID: <20210430152419.261757-3-i.mikhaylov@yadro.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430152419.261757-1-i.mikhaylov@yadro.com> References: <20210430152419.261757-1-i.mikhaylov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [10.199.0.97] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-03.corp.yadro.com (172.17.100.103) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add the low/high threshold options. Signed-off-by: Ivan Mikhaylov --- 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, }; From patchwork Fri Apr 30 15:24:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Mikhaylov X-Patchwork-Id: 12233641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 985F4C433ED for ; Fri, 30 Apr 2021 15:16:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 615636144B for ; Fri, 30 Apr 2021 15:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230303AbhD3PRF (ORCPT ); Fri, 30 Apr 2021 11:17:05 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55726 "EHLO mta-01.yadro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230126AbhD3PQz (ORCPT ); Fri, 30 Apr 2021 11:16:55 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 399F341490; Fri, 30 Apr 2021 15:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1619795765; x=1621610166; bh=EiJDFbi7rgHkUXnCqteaHRXKMiFzNTVs0C2 mRVFQwjs=; b=NKAVueKy2BQyVhXnc/pwHOsDl1qkpFspHnzdFBqEthp23lWTb3X 17MPuKfQyZNMwbm1wyr8/YLmGOjs5Sty9Zt5FuiNZvkcpAlSl8HBuiEHViIr3eIr EcNrThB1oMkG6SAzf9YvJB2wcsabMOS9pBjfU4zYExLt88wOiRl3ObdQ= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AKcO8JmtRDen; Fri, 30 Apr 2021 18:16:05 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 5009341499; Fri, 30 Apr 2021 18:16:04 +0300 (MSK) Received: from localhost.yadro.com (10.199.0.97) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Fri, 30 Apr 2021 18:16:04 +0300 From: Ivan Mikhaylov To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Jean Delvare , Guenter Roeck CC: Ivan Mikhaylov , , , Subject: [PATCH 3/4] iio: proximity: vncl3020: remove mutex from vcnl3020_data Date: Fri, 30 Apr 2021 18:24:18 +0300 Message-ID: <20210430152419.261757-4-i.mikhaylov@yadro.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430152419.261757-1-i.mikhaylov@yadro.com> References: <20210430152419.261757-1-i.mikhaylov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [10.199.0.97] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-03.corp.yadro.com (172.17.100.103) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Remove the mutex from vcnl3020_data structure and change it on iio_device_claim_direct_mode/iio_device_release_direct_mode. Signed-off-by: Ivan Mikhaylov --- drivers/iio/proximity/vcnl3020.c | 40 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/drivers/iio/proximity/vcnl3020.c b/drivers/iio/proximity/vcnl3020.c index 0dfa6a0b5eec..bff59c7af966 100644 --- a/drivers/iio/proximity/vcnl3020.c +++ b/drivers/iio/proximity/vcnl3020.c @@ -71,13 +71,11 @@ static const int vcnl3020_prox_sampling_frequency[][2] = { * @regmap: device register map. * @dev: vcnl3020 device. * @rev: revision id. - * @lock: lock for protecting access to device hardware registers. */ struct vcnl3020_data { struct regmap *regmap; struct device *dev; u8 rev; - struct mutex lock; }; /** @@ -149,7 +147,6 @@ static int vcnl3020_init(struct vcnl3020_data *data) } data->rev = reg; - mutex_init(&data->lock); return vcnl3020_get_and_apply_property(data, vcnl3020_led_current_property); @@ -161,11 +158,9 @@ static int vcnl3020_measure_proximity(struct vcnl3020_data *data, int *val) unsigned int reg; __be16 res; - mutex_lock(&data->lock); - rc = regmap_write(data->regmap, VCNL_COMMAND, VCNL_PS_OD); if (rc) - goto err_unlock; + return rc; /* wait for data to become ready */ rc = regmap_read_poll_timeout(data->regmap, VCNL_COMMAND, reg, @@ -174,20 +169,17 @@ static int vcnl3020_measure_proximity(struct vcnl3020_data *data, int *val) if (rc) { dev_err(data->dev, "Error (%d) reading vcnl3020 command register\n", rc); - goto err_unlock; + return rc; } /* high & low result bytes read */ rc = regmap_bulk_read(data->regmap, VCNL_PS_RESULT_HI, &res, sizeof(res)); if (rc) - goto err_unlock; + return rc; *val = be16_to_cpu(res); -err_unlock: - mutex_unlock(&data->lock); - return rc; } @@ -450,25 +442,37 @@ static int vcnl3020_read_raw(struct iio_dev *indio_dev, int rc; struct vcnl3020_data *data = iio_priv(indio_dev); + rc = iio_device_claim_direct_mode(indio_dev); + if (rc) + return rc; + switch (mask) { case IIO_CHAN_INFO_RAW: /* Protect against event capture. */ - if (vcnl3020_is_in_periodic_mode(data)) - return -EBUSY; + if (vcnl3020_is_in_periodic_mode(data)) { + rc = -EBUSY; + goto end; + } rc = vcnl3020_measure_proximity(data, val); if (rc) - return rc; - return IIO_VAL_INT; + goto end; + rc = IIO_VAL_INT; + goto end; case IIO_CHAN_INFO_SAMP_FREQ: rc = vcnl3020_read_proxy_samp_freq(data, val, val2); if (rc < 0) - return rc; - return IIO_VAL_INT_PLUS_MICRO; + goto end; + rc = IIO_VAL_INT_PLUS_MICRO; + goto end; default: - return -EINVAL; + rc = -EINVAL; } + +end: + iio_device_release_direct_mode(indio_dev); + return rc; } static int vcnl3020_write_raw(struct iio_dev *indio_dev, From patchwork Fri Apr 30 15:24:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Mikhaylov X-Patchwork-Id: 12233643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE97AC433B4 for ; Fri, 30 Apr 2021 15:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A151461186 for ; Fri, 30 Apr 2021 15:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230369AbhD3PRG (ORCPT ); Fri, 30 Apr 2021 11:17:06 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55740 "EHLO mta-01.yadro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230164AbhD3PQ5 (ORCPT ); Fri, 30 Apr 2021 11:16:57 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 63115414A1; Fri, 30 Apr 2021 15:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1619795766; x=1621610167; bh=ZzAfgGsAQnND901zCQ+ecLPaXOp+mjfpO4J 5B8JnHLc=; b=I6/Cpc4/OM3aLw614dYVJ9eZN4uYNzbFWblIYomN41als6HCAaX euEzRNI13BdR0vLD1j6gRIUcK05rcIOP0iPZx7olSU7cgGIAjPvzAmZhyKQ7XyS9 qwKe/zC0B6F3cuo7JSU8j8lVntLN6UqBjLi9bIsH3IA210wLxW55Useg= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wmbL2hlub195; Fri, 30 Apr 2021 18:16:06 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id B112D41495; Fri, 30 Apr 2021 18:16:04 +0300 (MSK) Received: from localhost.yadro.com (10.199.0.97) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Fri, 30 Apr 2021 18:16:04 +0300 From: Ivan Mikhaylov To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Jean Delvare , Guenter Roeck CC: Ivan Mikhaylov , , , Subject: [PATCH 4/4] hwmon: vcnl3020: add hwmon driver for intrusion sensor Date: Fri, 30 Apr 2021 18:24:19 +0300 Message-ID: <20210430152419.261757-5-i.mikhaylov@yadro.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430152419.261757-1-i.mikhaylov@yadro.com> References: <20210430152419.261757-1-i.mikhaylov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [10.199.0.97] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-03.corp.yadro.com (172.17.100.103) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Intrusion status detection via Interrupt Status Register. Signed-off-by: Ivan Mikhaylov Reported-by: kernel test robot --- drivers/hwmon/Kconfig | 7 +++ drivers/hwmon/Makefile | 1 + drivers/hwmon/vcnl3020-hwmon.c | 57 ++++++++++++++++++++++ drivers/iio/proximity/vcnl3020.c | 67 ++++++++++++++++++++------ include/linux/iio/proximity/vcnl3020.h | 26 ++++++++++ 5 files changed, 143 insertions(+), 15 deletions(-) create mode 100644 drivers/hwmon/vcnl3020-hwmon.c create mode 100644 include/linux/iio/proximity/vcnl3020.h diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 1ecf697d8d99..862205bbb3bf 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1916,6 +1916,13 @@ config SENSORS_TMP513 This driver can also be built as a module. If so, the module will be called tmp513. +config SENSORS_VCNL3020 + tristate "VCNL3020" + depends on I2C && VCNL3020 + help + If you say yes here you get support for the intrusion + sensor via VCNL3020 proximity sensor. + config SENSORS_VEXPRESS tristate "Versatile Express" depends on VEXPRESS_CONFIG diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 09a86c5e1d29..1d96212587aa 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -186,6 +186,7 @@ obj-$(CONFIG_SENSORS_TMP108) += tmp108.o obj-$(CONFIG_SENSORS_TMP401) += tmp401.o obj-$(CONFIG_SENSORS_TMP421) += tmp421.o obj-$(CONFIG_SENSORS_TMP513) += tmp513.o +obj-$(CONFIG_SENSORS_VCNL3020) += vcnl3020-hwmon.o obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress-hwmon.o obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o obj-$(CONFIG_SENSORS_VIA686A) += via686a.o diff --git a/drivers/hwmon/vcnl3020-hwmon.c b/drivers/hwmon/vcnl3020-hwmon.c new file mode 100644 index 000000000000..199bea25723b --- /dev/null +++ b/drivers/hwmon/vcnl3020-hwmon.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * vcnl3020-hwmon.c - intrusion sensor. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static ssize_t vcnl3020_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct vcnl3020_data *vcnl3020_data = dev_get_drvdata(dev); + + bool data = vcnl3020_is_thr_triggered(vcnl3020_data); + + return sprintf(buf, "%u\n", data); +} + +static SENSOR_DEVICE_ATTR_2_RO(intrusion0_alarm, vcnl3020, 0, 0); + +static struct attribute *vcnl3020_attrs[] = { + &sensor_dev_attr_intrusion0_alarm.dev_attr.attr, + NULL +}; +ATTRIBUTE_GROUPS(vcnl3020); + +static int32_t vcnl3020_hwmon_probe(struct platform_device *pdev) +{ + struct vcnl3020_data *vcnl3020_data = platform_get_drvdata(pdev); + struct device *hwmon_dev; + + hwmon_dev = devm_hwmon_device_register_with_groups(&pdev->dev, + VCNL3020_DRV, + vcnl3020_data, + vcnl3020_groups); + return PTR_ERR_OR_ZERO(hwmon_dev); +} + +static struct platform_driver vcnl3020_hwmon_driver = { + .probe = vcnl3020_hwmon_probe, + .driver = { + .name = VCNL3020_DRV_HWMON, + }, +}; + +module_platform_driver(vcnl3020_hwmon_driver); + +MODULE_AUTHOR("Ivan Mikhaylov "); +MODULE_DESCRIPTION("Intrusion sensor for VCNL3020"); +MODULE_LICENSE("GPL"); diff --git a/drivers/iio/proximity/vcnl3020.c b/drivers/iio/proximity/vcnl3020.c index bff59c7af966..67baa14cc900 100644 --- a/drivers/iio/proximity/vcnl3020.c +++ b/drivers/iio/proximity/vcnl3020.c @@ -11,9 +11,11 @@ #include #include #include +#include #include #include +#include #define VCNL3020_PROD_ID 0x21 @@ -66,18 +68,6 @@ static const int vcnl3020_prox_sampling_frequency[][2] = { {250, 0}, }; -/** - * struct vcnl3020_data - vcnl3020 specific data. - * @regmap: device register map. - * @dev: vcnl3020 device. - * @rev: revision id. - */ -struct vcnl3020_data { - struct regmap *regmap; - struct device *dev; - u8 rev; -}; - /** * struct vcnl3020_property - vcnl3020 property. * @name: property name. @@ -330,6 +320,23 @@ static int vcnl3020_write_event(struct iio_dev *indio_dev, return rc; } +#ifdef CONFIG_SENSORS_VCNL3020 + +bool vcnl3020_is_thr_triggered(struct vcnl3020_data *data) +{ + int rc; + unsigned int isr; + + rc = regmap_read(data->regmap, VCNL_ISR, &isr); + if (rc) + return false; + + return !!((isr & VCNL_INT_TH_LOW) || (isr & VCNL_INT_TH_HI)); +} +EXPORT_SYMBOL_GPL(vcnl3020_is_thr_triggered); + +#endif + static int vcnl3020_config_threshold(struct iio_dev *indio_dev, bool state) { struct vcnl3020_data *data = iio_priv(indio_dev); @@ -536,6 +543,7 @@ static int vcnl3020_probe(struct i2c_client *client) struct vcnl3020_data *data; struct iio_dev *indio_dev; struct regmap *regmap; + struct platform_device *pdev; int rc; regmap = devm_regmap_init_i2c(client, &vcnl3020_regmap_config); @@ -560,10 +568,39 @@ static int vcnl3020_probe(struct i2c_client *client) indio_dev->info = &vcnl3020_info; indio_dev->channels = vcnl3020_channels; indio_dev->num_channels = ARRAY_SIZE(vcnl3020_channels); - indio_dev->name = "vcnl3020"; + indio_dev->name = VCNL3020_DRV; indio_dev->modes = INDIO_DIRECT_MODE; - return devm_iio_device_register(&client->dev, indio_dev); + rc = devm_iio_device_register(&client->dev, indio_dev); + if (rc != 0) + goto err_out; + +#ifdef CONFIG_SENSORS_VCNL3020 + + pdev = platform_device_alloc(VCNL3020_DRV_HWMON, -1); + if (!pdev) { + dev_err(&client->dev, "Failed to allocate %s\n", + VCNL3020_DRV_HWMON); + rc = -ENOMEM; + goto err_out; + } + + pdev->dev.parent = &indio_dev->dev; + platform_set_drvdata(pdev, data); + rc = platform_device_add(pdev); + if (rc != 0) { + dev_err(&client->dev, "Failed to register %s: %d\n", + VCNL3020_DRV_HWMON, rc); + platform_device_put(pdev); + pdev = NULL; + goto err_out; + } + +#endif + +err_out: + + return rc; } static const struct of_device_id vcnl3020_of_match[] = { @@ -576,7 +613,7 @@ MODULE_DEVICE_TABLE(of, vcnl3020_of_match); static struct i2c_driver vcnl3020_driver = { .driver = { - .name = "vcnl3020", + .name = VCNL3020_DRV, .of_match_table = vcnl3020_of_match, }, .probe_new = vcnl3020_probe, diff --git a/include/linux/iio/proximity/vcnl3020.h b/include/linux/iio/proximity/vcnl3020.h new file mode 100644 index 000000000000..d99783298e6e --- /dev/null +++ b/include/linux/iio/proximity/vcnl3020.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * This file describe API for VCNL3020 proximity sensor. + */ + +#ifndef VCNL3020_PROXIMITY_H +#define VCNL3020_PROXIMITY_H + +#define VCNL3020_DRV_HWMON "vcnl3020-hwmon" +#define VCNL3020_DRV "vcnl3020" + +/** + * struct vcnl3020_data - vcnl3020 specific data. + * @regmap: device register map. + * @dev: vcnl3020 device. + * @rev: revision id. + */ +struct vcnl3020_data { + struct regmap *regmap; + struct device *dev; + u8 rev; +}; + +bool vcnl3020_is_thr_triggered(struct vcnl3020_data *data); + +#endif