Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3983765rwr; Mon, 8 May 2023 00:39:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55qDuOqGI2babMxIe+OpjpzH/+pW9plx0uavBmr2CHGfjnAXtYDbk8mLZIRG3xnQn/8Je3 X-Received: by 2002:a05:6a00:14d0:b0:63d:2f13:1f3 with SMTP id w16-20020a056a0014d000b0063d2f1301f3mr12704928pfu.33.1683531582355; Mon, 08 May 2023 00:39:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683531582; cv=none; d=google.com; s=arc-20160816; b=uXkFv3gghzIpJKpYQ4x1ungmOZuQX0vTPAvpkMuTANWcw1fIvVuOj8TAIm6c3hp5yY XM/YTPQH8bIXDef6jOUIzMeVF7+POK5jBWfV8FGWBgOSAfve6Qdwxf+KX/MWCYEaIA8T W931AmgatjkW9PogKEaAkPGfhu1MR1uL5b7C9LpbKKTRyiG3RB0IKIKw3MRz/anbUw/s 5bg4y81xg7e99TdGyX0Z+g/3rMY+M3cHipBuDzyo4IgrULUTR26mhhKwV4xdYU4vUShx SJVeLSPbdh080riFr8tZWLtZ2h8GhpvZc/Wa+aS9iMAlovGYZGhYR9JjSCsZgnl0jH3n dc+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iNjjcLcTLmyGjFy8ODPKZmYimQ0QXkyn/MgBpnKyLig=; b=NiXL3ugSn9lJhr3djxrbC4ayvVg74TSF3JLMdeGsxc5UCRxJqJbAkWINSB+pMciZjZ kNeY3fk1sbvea0sYhOzFzhkIbHUjLS3PXTFYP5RfSWxI4mvLA2j+fSZ+jWwZGE+x2aEE YahTLKKX6t96Shkg+gd0G/0HRYlMTL52TmVmqvuRwx/1Rx3oC4K3Fxnj3iC3YxDv/3mY 0FBFshZ+2dfs7XltQ9RssvShZIlrh7YgdHgZdX5e8Ijsh2gpv7w17RuSZvSBK9d/P8QK 7VDBgdoPdjh+Cm7HRYmexGTKlhLUGMQmYLmANSwCPEp82JpWTfC52BZKrZpufK9ZOA4m XqXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=azNicJCq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 70-20020a621849000000b0063b8a054e06si8037419pfy.259.2023.05.08.00.39.27; Mon, 08 May 2023 00:39:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=azNicJCq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233487AbjEHHKr (ORCPT + 99 others); Mon, 8 May 2023 03:10:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233165AbjEHHKM (ORCPT ); Mon, 8 May 2023 03:10:12 -0400 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 937EB1A1C0; Mon, 8 May 2023 00:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1683529800; x=1715065800; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iNjjcLcTLmyGjFy8ODPKZmYimQ0QXkyn/MgBpnKyLig=; b=azNicJCqPdQ2rcwlKHeHN3w9rZTXJndpjqF1hO4SpojY1CIXGpZLIWtZ wpKHV7QbAuWXLEmcqDCgD2IFUcRxovyIXmB8/kmX7PlohQR4N52IgSnZD rE3v320TxZHz2iUoNmzyeIBDgkunrNh0lxxYjF7QeATFDPqLPcaM8BCvX h5TGy2QaaFMkacCz3LyIzHoCOg7Kwc8AcdFQz1JSuPinO+g1et2i53F0O Qhu/4iuyp8OfeBazr6NYrRjZVmWbf+7P33nYycD7ihgRk5DgNwGZpOu2o A7V5pg8cyqjApGD2zd2CuGLmcbaazIzwwEdbmI0GTiy5VtJn+D1hlVM4m Q==; From: Astrid Rost To: Jonathan Cameron CC: , Astrid Rost , Astrid Rost , Lars-Peter Clausen , , Subject: [PATCH v1 6/7] iio: light: vcnl4000: Add oversampling_ratio for 4040/4200 Date: Mon, 8 May 2023 09:09:24 +0200 Message-ID: <20230508070925.2123265-7-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230508070925.2123265-1-astrid.rost@axis.com> References: <20230508070925.2123265-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the proximity multi pulse (PS_MPS) as oversampling_ratio. One raw value is calculated out of the set amount of pulses. Add read/write attribute for proximity oversampling-ratio and read attribute for available oversampling-ratio. This is supported for vcnl4040 and vcnl4200. Signed-off-by: Astrid Rost --- drivers/iio/light/vcnl4000.c | 86 +++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 5c6359d1e0ba..ab70c6fd5520 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -60,6 +60,7 @@ #define VCNL4200_AL_CONF 0x00 /* Ambient light configuration */ #define VCNL4200_PS_CONF1 0x03 /* Proximity configuration */ +#define VCNL4200_PS_CONF3 0x04 /* Proximity configuration */ #define VCNL4040_PS_THDL_LM 0x06 /* Proximity threshold low */ #define VCNL4040_PS_THDH_LM 0x07 /* Proximity threshold high */ #define VCNL4040_ALS_THDL_LM 0x02 /* Ambient light threshold low */ @@ -89,6 +90,7 @@ #define VCNL4040_PS_CONF2_PS_IT GENMASK(3, 1) /* Proximity integration time */ #define VCNL4040_CONF1_PS_PERS GENMASK(5, 4) /* Proximity interrupt persistence setting */ #define VCNL4040_PS_CONF2_PS_INT GENMASK(9, 8) /* Proximity interrupt mode */ +#define VCNL4040_PS_CONF3_MPS GENMASK(6, 5) /* Proximity multi pulse number */ #define VCNL4040_PS_IF_AWAY BIT(8) /* Proximity event cross low threshold */ #define VCNL4040_PS_IF_CLOSE BIT(9) /* Proximity event cross high threshold */ #define VCNL4040_ALS_RISING BIT(12) /* Ambient Light cross high threshold */ @@ -157,6 +159,7 @@ static const int vcnl4200_als_it_times[][2] = { static const int vcnl4040_als_debounce_count[] = {1, 2, 4, 8}; static const int vcnl4040_ps_debounce_count[] = {1, 2, 3, 4}; +static const int vcnl4040_ps_oversampling_ratio[] = {1, 2, 4, 8}; #define VCNL4000_SLEEP_DELAY_MS 2000 /* before we enter pm_runtime_suspend */ @@ -780,6 +783,56 @@ static ssize_t vcnl4040_write_ps_debounce_count(struct vcnl4000_data *data, int return ret; } +static ssize_t vcnl4040_read_ps_oversampling_ratio(struct vcnl4000_data *data, int *val) +{ + int ret; + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF3); + if (ret < 0) + return ret; + + ret = FIELD_GET(VCNL4040_PS_CONF3_MPS, ret); + + if (ret >= ARRAY_SIZE(vcnl4040_ps_oversampling_ratio)) + return -EINVAL; + + *val = vcnl4040_ps_oversampling_ratio[ret]; + + return ret; +} + +static ssize_t vcnl4040_write_ps_oversampling_ratio(struct vcnl4000_data *data, int val) +{ + unsigned int i; + int ret, index = -1; + u16 regval; + + for (i = 0; i < ARRAY_SIZE(vcnl4040_ps_oversampling_ratio); i++) { + if (val == vcnl4040_ps_oversampling_ratio[i]) { + index = i; + break; + } + } + + if (index < 0) + return -EINVAL; + + mutex_lock(&data->vcnl4000_lock); + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF3); + if (ret < 0) + goto out; + + regval = (ret & ~VCNL4040_PS_CONF3_MPS) | + FIELD_PREP(VCNL4040_PS_CONF3_MPS, index); + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF3, + regval); + +out: + mutex_unlock(&data->vcnl4000_lock); + return ret; +} + static int vcnl4000_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -844,6 +897,16 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev, if (ret < 0) return ret; return IIO_VAL_INT; + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + switch (chan->type) { + case IIO_PROXIMITY: + ret = vcnl4040_read_ps_oversampling_ratio(data, val); + if (ret < 0) + return ret; + return IIO_VAL_INT; + default: + return -EINVAL; + } default: return -EINVAL; @@ -877,6 +940,13 @@ static int vcnl4040_write_raw(struct iio_dev *indio_dev, default: return -EINVAL; } + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + switch (chan->type) { + case IIO_PROXIMITY: + return vcnl4040_write_ps_oversampling_ratio(data, val); + default: + return -EINVAL; + } default: return -EINVAL; } @@ -930,6 +1000,16 @@ static int vcnl4040_read_avail(struct iio_dev *indio_dev, } *type = IIO_VAL_INT; return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + switch (chan->type) { + case IIO_PROXIMITY: + *vals = (int *)vcnl4040_ps_oversampling_ratio; + *length = ARRAY_SIZE(vcnl4040_ps_oversampling_ratio); + *type = IIO_VAL_INT; + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } default: return -EINVAL; } @@ -1653,9 +1733,11 @@ static const struct iio_chan_spec vcnl4040_channels[] = { .type = IIO_PROXIMITY, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_INT_TIME) | - BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT), + BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME) | - BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT), + BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), .ext_info = vcnl4000_ext_info, .event_spec = vcnl4040_event_spec, .num_event_specs = ARRAY_SIZE(vcnl4040_event_spec), -- 2.30.2